Commit 8e9b59b2 authored by Michał Mirosław's avatar Michał Mirosław Committed by David S. Miller

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: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a9a6fb37
...@@ -5483,8 +5483,6 @@ int register_netdevice(struct net_device *dev) ...@@ -5483,8 +5483,6 @@ int register_netdevice(struct net_device *dev)
if (!(dev->wanted_features & NETIF_F_SG)) if (!(dev->wanted_features & NETIF_F_SG))
dev->wanted_features &= ~NETIF_F_GSO; dev->wanted_features &= ~NETIF_F_GSO;
netdev_update_features(dev);
/* Enable GRO and NETIF_F_HIGHDMA for vlans by default, /* Enable GRO and NETIF_F_HIGHDMA for vlans by default,
* vlan_dev_init() will do the dev->features check, so these features * vlan_dev_init() will do the dev->features check, so these features
* are enabled only if supported by underlying device. * are enabled only if supported by underlying device.
...@@ -5501,6 +5499,8 @@ int register_netdevice(struct net_device *dev) ...@@ -5501,6 +5499,8 @@ int register_netdevice(struct net_device *dev)
goto err_uninit; goto err_uninit;
dev->reg_state = NETREG_REGISTERED; dev->reg_state = NETREG_REGISTERED;
netdev_update_features(dev);
/* /*
* Default initial state at registry is that the * Default initial state at registry is that the
* device is present. * device is present.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment