Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: s/__dev_set_mtu/__netif_set_mtu/

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_set_mtu is used only by bond, so move it into
NETDEV_INTERNAL namespace.

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

authored by

Stanislav Fomichev and committed by
Jakub Kicinski
303a8487 0413a34e

+15 -11
+1 -1
drivers/net/bonding/bond_main.c
··· 2669 2669 2670 2670 if (unregister) { 2671 2671 netdev_lock_ops(slave_dev); 2672 - __dev_set_mtu(slave_dev, slave->original_mtu); 2672 + __netif_set_mtu(slave_dev, slave->original_mtu); 2673 2673 netdev_unlock_ops(slave_dev); 2674 2674 } else { 2675 2675 dev_set_mtu(slave_dev, slave->original_mtu);
+1 -1
include/linux/netdevice.h
··· 4211 4211 struct netlink_ext_ack *extack); 4212 4212 int dev_change_net_namespace(struct net_device *dev, struct net *net, 4213 4213 const char *pat); 4214 - int __dev_set_mtu(struct net_device *, int); 4214 + int __netif_set_mtu(struct net_device *dev, int new_mtu); 4215 4215 int netif_set_mtu(struct net_device *dev, int new_mtu); 4216 4216 int dev_set_mtu(struct net_device *, int); 4217 4217 int netif_pre_changeaddr_notify(struct net_device *dev, const char *addr,
+13 -9
net/core/dev.c
··· 9594 9594 return ret; 9595 9595 } 9596 9596 9597 - int __dev_set_mtu(struct net_device *dev, int new_mtu) 9597 + int __netif_set_mtu(struct net_device *dev, int new_mtu) 9598 9598 { 9599 9599 const struct net_device_ops *ops = dev->netdev_ops; 9600 9600 ··· 9605 9605 WRITE_ONCE(dev->mtu, new_mtu); 9606 9606 return 0; 9607 9607 } 9608 - EXPORT_SYMBOL(__dev_set_mtu); 9608 + EXPORT_SYMBOL_NS_GPL(__netif_set_mtu, "NETDEV_INTERNAL"); 9609 9609 9610 9610 int dev_validate_mtu(struct net_device *dev, int new_mtu, 9611 9611 struct netlink_ext_ack *extack) ··· 9624 9624 } 9625 9625 9626 9626 /** 9627 - * netif_set_mtu_ext - Change maximum transfer unit 9628 - * @dev: device 9629 - * @new_mtu: new transfer unit 9630 - * @extack: netlink extended ack 9627 + * netif_set_mtu_ext() - Change maximum transfer unit 9628 + * @dev: device 9629 + * @new_mtu: new transfer unit 9630 + * @extack: netlink extended ack 9631 9631 * 9632 - * Change the maximum transfer size of the network device. 9632 + * Change the maximum transfer size of the network device. 9633 + * 9634 + * Return: 0 on success, -errno on failure. 9633 9635 */ 9634 9636 int netif_set_mtu_ext(struct net_device *dev, int new_mtu, 9635 9637 struct netlink_ext_ack *extack) 9636 9638 { 9637 9639 int err, orig_mtu; 9640 + 9641 + netdev_ops_assert_locked(dev); 9638 9642 9639 9643 if (new_mtu == dev->mtu) 9640 9644 return 0; ··· 9656 9652 return err; 9657 9653 9658 9654 orig_mtu = dev->mtu; 9659 - err = __dev_set_mtu(dev, new_mtu); 9655 + err = __netif_set_mtu(dev, new_mtu); 9660 9656 9661 9657 if (!err) { 9662 9658 err = call_netdevice_notifiers_mtu(NETDEV_CHANGEMTU, dev, ··· 9666 9662 /* setting mtu back and notifying everyone again, 9667 9663 * so that they have a chance to revert changes. 9668 9664 */ 9669 - __dev_set_mtu(dev, orig_mtu); 9665 + __netif_set_mtu(dev, orig_mtu); 9670 9666 call_netdevice_notifiers_mtu(NETDEV_CHANGEMTU, dev, 9671 9667 new_mtu); 9672 9668 }