net: s/dev_pre_changeaddr_notify/netif_pre_changeaddr_notify/

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

Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250717172333.1288349-4-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 17c7542be6a55fec77a99885c1a2d18f4bf4650d..d8281c486a4440ec6632be7388d201aaf9b433ea 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1040,7 +1040,7 @@ static int bond_set_dev_addr(struct net_device *bond_dev,
 
        slave_dbg(bond_dev, slave_dev, "bond_dev=%p slave_dev=%p slave_dev->addr_len=%d\n",
                  bond_dev, slave_dev, slave_dev->addr_len);
-       err = dev_pre_changeaddr_notify(bond_dev, slave_dev->dev_addr, NULL);
+       err = netif_pre_changeaddr_notify(bond_dev, slave_dev->dev_addr, NULL);
        if (err)
                return err;
 
@@ -6743,3 +6743,4 @@ module_exit(bonding_exit);
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_AUTHOR("Thomas Davis, tadavis@lbl.gov and many others");
+MODULE_IMPORT_NS("NETDEV_INTERNAL");

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 0ed2fd833a5db7c76ede7a9ae096815033220880..660f3db117664e2f3c5f8042739ccb19d781ef9e 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -784,9 +784,9 @@ static int ipvlan_device_event(struct notifier_block *unused,
        case NETDEV_PRE_CHANGEADDR:
                prechaddr_info = ptr;
                list_for_each_entry(ipvlan, &port->ipvlans, pnode) {
-                       err = dev_pre_changeaddr_notify(ipvlan->dev,
-                                                   prechaddr_info->dev_addr,
-                                                   extack);
+                       err = netif_pre_changeaddr_notify(ipvlan->dev,
+                                                         prechaddr_info->dev_addr,
+                                                         extack);
                        if (err)
                                return notifier_from_errno(err);
                }
@@ -1094,3 +1094,4 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mahesh Bandewar <maheshb@google.com>");
 MODULE_DESCRIPTION("Driver for L3 (IPv6/IPv4) based VLANs");
 MODULE_ALIAS_RTNL_LINK("ipvlan");
+MODULE_IMPORT_NS("NETDEV_INTERNAL");

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b3a48934b4cb8ab88029da02a1d26478e128c09e..55c5cd9d192943b55bb5c9a8fe48c022e87472f6 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4214,8 +4214,8 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net,
 int __dev_set_mtu(struct net_device *, int);
 int netif_set_mtu(struct net_device *dev, int new_mtu);
 int dev_set_mtu(struct net_device *, int);
-int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr,
-                             struct netlink_ext_ack *extack);
+int netif_pre_changeaddr_notify(struct net_device *dev, const char *addr,
+                               struct netlink_ext_ack *extack);
 int netif_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,
                          struct netlink_ext_ack *extack);
 int dev_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 0adeafe11a3651829b9a09ed29d2e947ded5b5be..1885d0c315f0279d2471d0565aded9ea0e84a879 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -74,9 +74,9 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
                if (br->dev->addr_assign_type == NET_ADDR_SET)
                        break;
                prechaddr_info = ptr;
-               err = dev_pre_changeaddr_notify(br->dev,
-                                               prechaddr_info->dev_addr,
-                                               extack);
+               err = netif_pre_changeaddr_notify(br->dev,
+                                                 prechaddr_info->dev_addr,
+                                                 extack);
                if (err)
                        return notifier_from_errno(err);
                break;
@@ -484,3 +484,4 @@ MODULE_LICENSE("GPL");
 MODULE_VERSION(BR_VERSION);
 MODULE_ALIAS_RTNL_LINK("bridge");
 MODULE_DESCRIPTION("Ethernet bridge driver");
+MODULE_IMPORT_NS("NETDEV_INTERNAL");

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 2450690f98cfa5675c117c7f57497fd5689204ab..98c5b9c3145f37cf3808d70b8794381d5c07fd95 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -668,7 +668,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,
                /* Ask for permission to use this MAC address now, even if we
                 * don't end up choosing it below.
                 */
-               err = dev_pre_changeaddr_notify(br->dev, dev->dev_addr, extack);
+               err = netif_pre_changeaddr_notify(br->dev, dev->dev_addr,
+                                                 extack);
                if (err)
                        goto err6;
        }

diff --git a/net/core/dev.c b/net/core/dev.c
index d71f03874057ccbe0aeb4750e83aa499ce55e8af..a47754fa7b152ea6e6fb746731cdb0f81112579d 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -9716,13 +9716,15 @@ void netif_set_group(struct net_device *dev, int new_group)
 }
 
 /**
- *     dev_pre_changeaddr_notify - Call NETDEV_PRE_CHANGEADDR.
- *     @dev: device
- *     @addr: new address
- *     @extack: netlink extended ack
+ * netif_pre_changeaddr_notify() - Call NETDEV_PRE_CHANGEADDR.
+ * @dev: device
+ * @addr: new address
+ * @extack: netlink extended ack
+ *
+ * Return: 0 on success, -errno on failure.
  */
-int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr,
-                             struct netlink_ext_ack *extack)
+int netif_pre_changeaddr_notify(struct net_device *dev, const char *addr,
+                               struct netlink_ext_ack *extack)
 {
        struct netdev_notifier_pre_changeaddr_info info = {
                .info.dev = dev,
@@ -9734,7 +9736,7 @@ int dev_pre_changeaddr_notify(struct net_device *dev, const char *addr,
        rc = call_netdevice_notifiers_info(NETDEV_PRE_CHANGEADDR, &info.info);
        return notifier_to_errno(rc);
 }
-EXPORT_SYMBOL(dev_pre_changeaddr_notify);
+EXPORT_SYMBOL_NS_GPL(netif_pre_changeaddr_notify, "NETDEV_INTERNAL");
 
 int netif_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,
                          struct netlink_ext_ack *extack)
@@ -9748,7 +9750,7 @@ int netif_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,
                return -EINVAL;
        if (!netif_device_present(dev))
                return -ENODEV;
-       err = dev_pre_changeaddr_notify(dev, ss->__data, extack);
+       err = netif_pre_changeaddr_notify(dev, ss->__data, extack);
        if (err)
                return err;
        if (memcmp(dev->dev_addr, ss->__data, dev->addr_len)) {

diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
index 90716bd736f3e40fcc2134ccaff0595a0c968fff..76c91f224886c17230b904a2db6b0b80d3c8bfa4 100644 (file)
--- a/net/core/dev_addr_lists.c
+++ b/net/core/dev_addr_lists.c
@@ -603,7 +603,7 @@ int dev_addr_add(struct net_device *dev, const unsigned char *addr,
 
        ASSERT_RTNL();
 
-       err = dev_pre_changeaddr_notify(dev, addr, NULL);
+       err = netif_pre_changeaddr_notify(dev, addr, NULL);
        if (err)
                return err;
        err = __hw_addr_add(&dev->dev_addrs, addr, dev->addr_len, addr_type);