net: inline rollback_registered()

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>

diff --git a/net/core/dev.c b/net/core/dev.c
index e965836868240ec57f9fdb117e69b64956295d97..021aaf0f645426558bbbd190f643aa913f6e3e5d 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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,
        struct net_device *upper, netdev_features_t features)
 {
@@ -10148,7 +10139,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;
        }
        /*
@@ -10755,7 +10746,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);