Skip to content

Commit 88d3cec

Browse files
Stanislav Fomichevkuba-moo
authored andcommitted
net: s/dev_close_many/netif_close_many/
Commit cc34acd ("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 <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 5d4d846 commit 88d3cec

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

drivers/net/ethernet/mediatek/mtk_eth_soc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4967,7 +4967,7 @@ void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev)
49674967
list_add_tail(&dev->close_list, &dev_list);
49684968
}
49694969

4970-
dev_close_many(&dev_list, false);
4970+
netif_close_many(&dev_list, false);
49714971

49724972
eth->dma_dev = dma_dev;
49734973

@@ -5610,3 +5610,4 @@ module_platform_driver(mtk_driver);
56105610
MODULE_LICENSE("GPL");
56115611
MODULE_AUTHOR("John Crispin <[email protected]>");
56125612
MODULE_DESCRIPTION("Ethernet driver for MediaTek SoC");
5613+
MODULE_IMPORT_NS("NETDEV_INTERNAL");

include/linux/netdevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3343,7 +3343,7 @@ int netif_open(struct net_device *dev, struct netlink_ext_ack *extack);
33433343
int dev_open(struct net_device *dev, struct netlink_ext_ack *extack);
33443344
void netif_close(struct net_device *dev);
33453345
void dev_close(struct net_device *dev);
3346-
void dev_close_many(struct list_head *head, bool unlink);
3346+
void netif_close_many(struct list_head *head, bool unlink);
33473347
void netif_disable_lro(struct net_device *dev);
33483348
void dev_disable_lro(struct net_device *dev);
33493349
int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *newskb);

net/8021q/vlan.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
470470
list_add(&vlandev->close_list, &close_list);
471471
}
472472

473-
dev_close_many(&close_list, false);
473+
netif_close_many(&close_list, false);
474474

475475
list_for_each_entry_safe(vlandev, tmp, &close_list, close_list) {
476476
vlan_stacked_transfer_operstate(dev, vlandev,
@@ -765,3 +765,4 @@ module_exit(vlan_cleanup_module);
765765
MODULE_DESCRIPTION("802.1Q/802.1ad VLAN Protocol");
766766
MODULE_LICENSE("GPL");
767767
MODULE_VERSION(DRV_VERSION);
768+
MODULE_IMPORT_NS("NETDEV_INTERNAL");

net/core/dev.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,7 @@ static void __dev_close(struct net_device *dev)
17681768
list_del(&single);
17691769
}
17701770

1771-
void dev_close_many(struct list_head *head, bool unlink)
1771+
void netif_close_many(struct list_head *head, bool unlink)
17721772
{
17731773
struct net_device *dev, *tmp;
17741774

@@ -1786,15 +1786,15 @@ void dev_close_many(struct list_head *head, bool unlink)
17861786
list_del_init(&dev->close_list);
17871787
}
17881788
}
1789-
EXPORT_SYMBOL(dev_close_many);
1789+
EXPORT_SYMBOL_NS_GPL(netif_close_many, "NETDEV_INTERNAL");
17901790

17911791
void netif_close(struct net_device *dev)
17921792
{
17931793
if (dev->flags & IFF_UP) {
17941794
LIST_HEAD(single);
17951795

17961796
list_add(&dev->close_list, &single);
1797-
dev_close_many(&single, true);
1797+
netif_close_many(&single, true);
17981798
list_del(&single);
17991799
}
18001800
}
@@ -12099,15 +12099,15 @@ void unregister_netdevice_many_notify(struct list_head *head,
1209912099
netdev_lock(dev);
1210012100
}
1210112101
}
12102-
dev_close_many(&close_head, true);
12102+
netif_close_many(&close_head, true);
1210312103
/* ... now unlock them and go over the rest. */
1210412104
list_for_each_entry(dev, head, unreg_list) {
1210512105
if (netdev_need_ops_lock(dev))
1210612106
netdev_unlock(dev);
1210712107
else
1210812108
list_add_tail(&dev->close_list, &close_head);
1210912109
}
12110-
dev_close_many(&close_head, true);
12110+
netif_close_many(&close_head, true);
1211112111

1211212112
list_for_each_entry(dev, head, unreg_list) {
1211312113
/* And unlink it from device chain. */

net/dsa/dsa.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ void dsa_switch_shutdown(struct dsa_switch *ds)
16211621
dsa_switch_for_each_cpu_port(dp, ds)
16221622
list_add(&dp->conduit->close_list, &close_list);
16231623

1624-
dev_close_many(&close_list, true);
1624+
netif_close_many(&close_list, true);
16251625

16261626
dsa_switch_for_each_user_port(dp, ds) {
16271627
conduit = dsa_port_to_conduit(dp);
@@ -1829,3 +1829,4 @@ MODULE_AUTHOR("Lennert Buytenhek <[email protected]>");
18291829
MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips");
18301830
MODULE_LICENSE("GPL");
18311831
MODULE_ALIAS("platform:dsa");
1832+
MODULE_IMPORT_NS("NETDEV_INTERNAL");

net/dsa/user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3604,7 +3604,7 @@ static int dsa_user_netdevice_event(struct notifier_block *nb,
36043604
list_add(&dp->user->close_list, &close_list);
36053605
}
36063606

3607-
dev_close_many(&close_list, true);
3607+
netif_close_many(&close_list, true);
36083608

36093609
return NOTIFY_OK;
36103610
}

0 commit comments

Comments
 (0)