net: s/dev_close_many/netif_close_many/

Commit cc34acd577f1 ("docs: net: document new locking reality")
introduced netif_ vs dev_ function semantics: the former expects locked
netdev, the latter takes care of the locking. We don't strictly
follow this semantics on either side, but there are more dev_xxx handlers
now that don't fit. Rename them to netif_xxx where appropriate.

netif_close_many is used only by vlan/dsa and one mtk driver, so move it into
NETDEV_INTERNAL namespace.

Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250717172333.1288349-8-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 11ee7e1829bffd6d70b5b76ed6d4ecf8451e7f79..5a5fcde76dc0e776e6bb279fe528e90fb9e14321 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -4967,7 +4967,7 @@ void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev)
                list_add_tail(&dev->close_list, &dev_list);
        }
 
-       dev_close_many(&dev_list, false);
+       netif_close_many(&dev_list, false);
 
        eth->dma_dev = dma_dev;
 
@@ -5610,3 +5610,4 @@ module_platform_driver(mtk_driver);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
 MODULE_DESCRIPTION("Ethernet driver for MediaTek SoC");
+MODULE_IMPORT_NS("NETDEV_INTERNAL");

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 7929ddfd4433345f5c8a9e09a2dab431fe71d347..5aee8d3895f4c95adf1ab8a60d0564f17def2734 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3343,7 +3343,7 @@ int netif_open(struct net_device *dev, struct netlink_ext_ack *extack);
 int dev_open(struct net_device *dev, struct netlink_ext_ack *extack);
 void netif_close(struct net_device *dev);
 void dev_close(struct net_device *dev);
-void dev_close_many(struct list_head *head, bool unlink);
+void netif_close_many(struct list_head *head, bool unlink);
 void netif_disable_lro(struct net_device *dev);
 void dev_disable_lro(struct net_device *dev);
 int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *newskb);

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 7ffd3386a8429bca43acf5376b00ec8b41662879..fda3a80e9340cf7b51e75d1cbb1d3f0d28943b3c 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -470,7 +470,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
                                list_add(&vlandev->close_list, &close_list);
                }
 
-               dev_close_many(&close_list, false);
+               netif_close_many(&close_list, false);
 
                list_for_each_entry_safe(vlandev, tmp, &close_list, close_list) {
                        vlan_stacked_transfer_operstate(dev, vlandev,
@@ -765,3 +765,4 @@ module_exit(vlan_cleanup_module);
 MODULE_DESCRIPTION("802.1Q/802.1ad VLAN Protocol");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+MODULE_IMPORT_NS("NETDEV_INTERNAL");

diff --git a/net/core/dev.c b/net/core/dev.c
index a22f26997b942a8e587654c91e8550ac80f7d1ab..354d3453b4071cfeacae3d94be18095cd753c327 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1768,7 +1768,7 @@ static void __dev_close(struct net_device *dev)
        list_del(&single);
 }
 
-void dev_close_many(struct list_head *head, bool unlink)
+void netif_close_many(struct list_head *head, bool unlink)
 {
        struct net_device *dev, *tmp;
 
@@ -1786,7 +1786,7 @@ void dev_close_many(struct list_head *head, bool unlink)
                        list_del_init(&dev->close_list);
        }
 }
-EXPORT_SYMBOL(dev_close_many);
+EXPORT_SYMBOL_NS_GPL(netif_close_many, "NETDEV_INTERNAL");
 
 void netif_close(struct net_device *dev)
 {
@@ -1794,7 +1794,7 @@ void netif_close(struct net_device *dev)
                LIST_HEAD(single);
 
                list_add(&dev->close_list, &single);
-               dev_close_many(&single, true);
+               netif_close_many(&single, true);
                list_del(&single);
        }
 }
@@ -12099,7 +12099,7 @@ void unregister_netdevice_many_notify(struct list_head *head,
                        netdev_lock(dev);
                }
        }
-       dev_close_many(&close_head, true);
+       netif_close_many(&close_head, true);
        /* ... now unlock them and go over the rest. */
        list_for_each_entry(dev, head, unreg_list) {
                if (netdev_need_ops_lock(dev))
@@ -12107,7 +12107,7 @@ void unregister_netdevice_many_notify(struct list_head *head,
                else
                        list_add_tail(&dev->close_list, &close_head);
        }
-       dev_close_many(&close_head, true);
+       netif_close_many(&close_head, true);
 
        list_for_each_entry(dev, head, unreg_list) {
                /* And unlink it from device chain. */

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 436a7e1b412adead0f7ef0af6964bc21e3aebb16..5b01a0e43ebe8a8d9d6535fbaab82ebcfc6b19c8 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -1621,7 +1621,7 @@ void dsa_switch_shutdown(struct dsa_switch *ds)
        dsa_switch_for_each_cpu_port(dp, ds)
                list_add(&dp->conduit->close_list, &close_list);
 
-       dev_close_many(&close_list, true);
+       netif_close_many(&close_list, true);
 
        dsa_switch_for_each_user_port(dp, ds) {
                conduit = dsa_port_to_conduit(dp);
@@ -1829,3 +1829,4 @@ MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>");
 MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:dsa");
+MODULE_IMPORT_NS("NETDEV_INTERNAL");

diff --git a/net/dsa/user.c b/net/dsa/user.c
index e9334520c54a35c48c74031feb602c06d9763a0d..f59d66f0975d7dde7c8f4eb8395c90fcfd38b3b0 100644 (file)
--- a/net/dsa/user.c
+++ b/net/dsa/user.c
@@ -3604,7 +3604,7 @@ static int dsa_user_netdevice_event(struct notifier_block *nb,
                        list_add(&dp->user->close_list, &close_list);
                }
 
-               dev_close_many(&close_list, true);
+               netif_close_many(&close_list, true);
 
                return NOTIFY_OK;
        }