|
@@ -5606,10 +5606,6 @@ static void rollback_registered_many(struct list_head *head)
|
|
*/
|
|
*/
|
|
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
|
|
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
|
|
|
|
|
|
- if (!dev->rtnl_link_ops ||
|
|
|
|
- dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
|
|
|
|
- rtmsg_ifinfo(RTM_DELLINK, dev, ~0U, GFP_KERNEL);
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Flush the unicast and multicast chains
|
|
* Flush the unicast and multicast chains
|
|
*/
|
|
*/
|
|
@@ -5619,6 +5615,10 @@ static void rollback_registered_many(struct list_head *head)
|
|
if (dev->netdev_ops->ndo_uninit)
|
|
if (dev->netdev_ops->ndo_uninit)
|
|
dev->netdev_ops->ndo_uninit(dev);
|
|
dev->netdev_ops->ndo_uninit(dev);
|
|
|
|
|
|
|
|
+ if (!dev->rtnl_link_ops ||
|
|
|
|
+ dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
|
|
|
|
+ rtmsg_ifinfo(RTM_DELLINK, dev, ~0U, GFP_KERNEL);
|
|
|
|
+
|
|
/* Notifier chain MUST detach us all upper devices. */
|
|
/* Notifier chain MUST detach us all upper devices. */
|
|
WARN_ON(netdev_has_any_upper_dev(dev));
|
|
WARN_ON(netdev_has_any_upper_dev(dev));
|
|
|
|
|