@@ -5709,7 +5709,7 @@ static void flush_all_backlogs(void)
}
/* we can have in flight packet[s] on the cpus we are not flushing,
- * synchronize_net() in rollback_registered_many() will take care of
+ * synchronize_net() in unregister_netdevice_many() will take care of
* them
*/
for_each_cpu(cpu, &flush_cpus)
@@ -10605,8 +10605,6 @@ void synchronize_net(void)
}
EXPORT_SYMBOL(synchronize_net);
-static void rollback_registered_many(struct list_head *head);
-
/**
* unregister_netdevice_queue - remove device from the kernel
* @dev: device
@@ -10630,7 +10628,7 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)
LIST_HEAD(single);
list_add(&dev->unreg_list, &single);
- rollback_registered_many(&single);
+ unregister_netdevice_many(&single);
list_del(&single);
}
}
@@ -10644,15 +10642,6 @@ EXPORT_SYMBOL(unregister_netdevice_queue);
* we force a list_del() to make sure stack wont be corrupted later.
*/
void unregister_netdevice_many(struct list_head *head)
-{
- if (!list_empty(head)) {
- rollback_registered_many(head);
- list_del(head);
- }
-}
-EXPORT_SYMBOL(unregister_netdevice_many);
-
-static void rollback_registered_many(struct list_head *head)
{
struct net_device *dev, *tmp;
LIST_HEAD(close_head);
@@ -10660,6 +10649,9 @@ static void rollback_registered_many(struct list_head *head)
BUG_ON(dev_boot_phase);
ASSERT_RTNL();
+ if (list_empty(head))
+ return;
+
list_for_each_entry_safe(dev, tmp, head, unreg_list) {
/* Some devices call without registering
* for initialization unwind. Remove those
@@ -10744,6 +10736,7 @@ static void rollback_registered_many(struct list_head *head)
net_set_todo(dev);
}
}
+EXPORT_SYMBOL(unregister_netdevice_many);
/**
* unregister_netdev - remove device from the kernel
Similar to the change for rollback_registered() - rollback_registered_many() was a part of unregister_netdevice_many() minus the net_set_todo(), which is no longer needed. Functionally this patch moves the list_empty() check back after: BUG_ON(dev_boot_phase); ASSERT_RTNL(); but I can't find any reason why that would be an issue. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- net/core/dev.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)