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>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index d8281c486a4440ec6632be7388d201aaf9b433ea..257333c8871092e42d6338e631464ad9e3ff5d99 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2669,7 +2669,7 @@ static int __bond_release_one(struct net_device *bond_dev,
 
        if (unregister) {
                netdev_lock_ops(slave_dev);
-               __dev_set_mtu(slave_dev, slave->original_mtu);
+               __netif_set_mtu(slave_dev, slave->original_mtu);
                netdev_unlock_ops(slave_dev);
        } else {
                dev_set_mtu(slave_dev, slave->original_mtu);

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 55c5cd9d192943b55bb5c9a8fe48c022e87472f6..8978fbfbd644ada5f240a7ac7eb2873ff5a253d7 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4211,7 +4211,7 @@ int __dev_change_net_namespace(struct net_device *dev, struct net *net,
                               struct netlink_ext_ack *extack);
 int dev_change_net_namespace(struct net_device *dev, struct net *net,
                             const char *pat);
-int __dev_set_mtu(struct net_device *, int);
+int __netif_set_mtu(struct net_device *dev, int new_mtu);
 int netif_set_mtu(struct net_device *dev, int new_mtu);
 int dev_set_mtu(struct net_device *, int);
 int netif_pre_changeaddr_notify(struct net_device *dev, const char *addr,

diff --git a/net/core/dev.c b/net/core/dev.c
index a47754fa7b152ea6e6fb746731cdb0f81112579d..a056f0dfc516a191c0d7fe6abe829dcccfba0d85 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -9594,7 +9594,7 @@ int netif_change_flags(struct net_device *dev, unsigned int flags,
        return ret;
 }
 
-int __dev_set_mtu(struct net_device *dev, int new_mtu)
+int __netif_set_mtu(struct net_device *dev, int new_mtu)
 {
        const struct net_device_ops *ops = dev->netdev_ops;
 
@@ -9605,7 +9605,7 @@ int __dev_set_mtu(struct net_device *dev, int new_mtu)
        WRITE_ONCE(dev->mtu, new_mtu);
        return 0;
 }
-EXPORT_SYMBOL(__dev_set_mtu);
+EXPORT_SYMBOL_NS_GPL(__netif_set_mtu, "NETDEV_INTERNAL");
 
 int dev_validate_mtu(struct net_device *dev, int new_mtu,
                     struct netlink_ext_ack *extack)
@@ -9624,18 +9624,22 @@ int dev_validate_mtu(struct net_device *dev, int new_mtu,
 }
 
 /**
- *     netif_set_mtu_ext - Change maximum transfer unit
- *     @dev: device
- *     @new_mtu: new transfer unit
- *     @extack: netlink extended ack
+ * netif_set_mtu_ext() - Change maximum transfer unit
+ * @dev: device
+ * @new_mtu: new transfer unit
+ * @extack: netlink extended ack
  *
- *     Change the maximum transfer size of the network device.
+ * Change the maximum transfer size of the network device.
+ *
+ * Return: 0 on success, -errno on failure.
  */
 int netif_set_mtu_ext(struct net_device *dev, int new_mtu,
                      struct netlink_ext_ack *extack)
 {
        int err, orig_mtu;
 
+       netdev_ops_assert_locked(dev);
+
        if (new_mtu == dev->mtu)
                return 0;
 
@@ -9652,7 +9656,7 @@ int netif_set_mtu_ext(struct net_device *dev, int new_mtu,
                return err;
 
        orig_mtu = dev->mtu;
-       err = __dev_set_mtu(dev, new_mtu);
+       err = __netif_set_mtu(dev, new_mtu);
 
        if (!err) {
                err = call_netdevice_notifiers_mtu(NETDEV_CHANGEMTU, dev,
@@ -9662,7 +9666,7 @@ int netif_set_mtu_ext(struct net_device *dev, int new_mtu,
                        /* setting mtu back and notifying everyone again,
                         * so that they have a chance to revert changes.
                         */
-                       __dev_set_mtu(dev, orig_mtu);
+                       __netif_set_mtu(dev, orig_mtu);
                        call_netdevice_notifiers_mtu(NETDEV_CHANGEMTU, dev,
                                                     new_mtu);
                }