Skip to content

Commit

Permalink
net: inline rollback_registered()
Browse files Browse the repository at this point in the history
rollback_registered() is a local helper, it's common for driver
code to call unregister_netdevice_queue(dev, NULL) when they
want to unregister netdevices under rtnl_lock. Inline
rollback_registered() and adjust the only remaining caller.

Reviewed-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jakub Kicinski committed Jan 21, 2021
1 parent 2014bee commit 037e56b
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -9552,15 +9552,6 @@ static void rollback_registered_many(struct list_head *head)
}
}

static void rollback_registered(struct net_device *dev)
{
LIST_HEAD(single);

list_add(&dev->unreg_list, &single);
rollback_registered_many(&single);
list_del(&single);
}

static netdev_features_t netdev_sync_upper_features(struct net_device *lower,
struct net_device *upper, netdev_features_t features)
{
Expand Down Expand Up @@ -10110,7 +10101,7 @@ int register_netdevice(struct net_device *dev)
if (ret) {
/* Expect explicit free_netdev() on failure */
dev->needs_free_netdev = false;
rollback_registered(dev);
unregister_netdevice_queue(dev, NULL);
goto out;
}
/*
Expand Down Expand Up @@ -10732,7 +10723,11 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)
if (head) {
list_move_tail(&dev->unreg_list, head);
} else {
rollback_registered(dev);
LIST_HEAD(single);

list_add(&dev->unreg_list, &single);
rollback_registered_many(&single);
list_del(&single);
}
}
EXPORT_SYMBOL(unregister_netdevice_queue);
Expand Down

0 comments on commit 037e56b

Please sign in to comment.