xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: inline rollback_registered()

Browse Source 
commit 037e56bd965e1bc72c2fa9684ac25b56839a338e upstream.

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>
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jakub Kicinski
2022-07-15 19:26:30 +03:00
committed by Greg Kroah-Hartman
parent b1158677d4
commit 672fac0a43
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/core/dev.c
View File

@@ -9601,15 +9601,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, static netdev_features_t netdev_sync_upper_features(struct net_device *lower,
struct net_device *upper, netdev_features_t features) struct net_device *upper, netdev_features_t features)
{ {
@@ -10148,7 +10139,7 @@ int register_netdevice(struct net_device *dev)
if (ret) { if (ret) {
/* Expect explicit free_netdev() on failure */ /* Expect explicit free_netdev() on failure */
dev->needs_free_netdev = false; dev->needs_free_netdev = false;
rollback_registered(dev); unregister_netdevice_queue(dev, NULL);
goto out; goto out;
} }
/* /*
@@ -10755,7 +10746,11 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head)
if (head) { if (head) {
list_move_tail(&dev->unreg_list, head); list_move_tail(&dev->unreg_list, head);
} else { } 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); EXPORT_SYMBOL(unregister_netdevice_queue);