Commit 0413a34e authored Jul 17, 2025 by Stanislav Fomichev Committed by Jakub Kicinski Jul 18, 2025

net: s/dev_pre_changeaddr_notify/netif_pre_changeaddr_notify/



Commit cc34acd5 ("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>

parent af1d0173

drivers/net/bonding/bond_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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");

drivers/net/ipvlan/ipvlan_main.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -784,7 +784,7 @@ 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,
		err = netif_pre_changeaddr_notify(ipvlan->dev,
		prechaddr_info->dev_addr,
		extack);
		if (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");

include/linux/netdevice.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -4214,7 +4214,7 @@ 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,
		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);

net/bridge/br.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ 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,
		err = netif_pre_changeaddr_notify(br->dev,
		prechaddr_info->dev_addr,
		extack);
		if (err)
		@@ -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");

net/bridge/br_if.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}