diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-02-22 16:52:28 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-23 14:23:31 -0800 |
| commit | 8e9b59b219e520cfc2f80af471c6b0e67ad9dd75 (patch) | |
| tree | 93ff1838aa4f7c04b0ec58e7a61a7da50d66946b | |
| parent | a9a6fb374547044088ca37a30d4c3ca581cec80d (diff) | |
| download | linux-8e9b59b219e520cfc2f80af471c6b0e67ad9dd75.tar.gz | |
Fix "(unregistered net_device): Features changed" message
Fix netdev_update_features() messages on register time by moving the call further in register_netdevice(). When netdev->reg_state != NETREG_REGISTERED, netdev_name() returns "(unregistered netdevice)" even if the dev's name is already filled. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 578415c1ef75..77e5edb724f4 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5483,8 +5483,6 @@ int register_netdevice(struct net_device *dev) if (!(dev->wanted_features & NETIF_F_SG)) dev->wanted_features &= ~NETIF_F_GSO; - netdev_update_features(dev); - /* Enable GRO and NETIF_F_HIGHDMA for vlans by default, * vlan_dev_init() will do the dev->features check, so these features * are enabled only if supported by underlying device. @@ -5501,6 +5499,8 @@ int register_netdevice(struct net_device *dev) goto err_uninit; dev->reg_state = NETREG_REGISTERED; + netdev_update_features(dev); + /* * Default initial state at registry is that the * device is present. |