Commit af1d0173 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Jakub Kicinski
Browse files

net: s/dev_get_mac_address/netif_get_mac_address/ 



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_get_mac_address is used only by tun/tap, so move it into
NETDEV_INTERNAL namespace.

Signed-off-by: default avatarStanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250717172333.1288349-3-sdf@fomichev.me


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ffea1168

drivers/net/tap.c

+3 −2
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ static long tap_ioctl(struct file *file, unsigned int cmd, 
			return -ENOLINK;

		}

		ret = 0;

		dev_get_mac_address((struct sockaddr *)&ss, dev_net(tap->dev),

		netif_get_mac_address((struct sockaddr *)&ss, dev_net(tap->dev),

				      tap->dev->name);

		if (copy_to_user(&ifr->ifr_name, tap->dev->name, IFNAMSIZ) ||

		    copy_to_user(&ifr->ifr_hwaddr, &ss, sizeof(ifr->ifr_hwaddr)))
@@ -1282,3 +1282,4 @@ MODULE_DESCRIPTION("Common library for drivers implementing the TAP interface"); 
MODULE_AUTHOR("Arnd Bergmann <arnd@arndb.de>");

MODULE_AUTHOR("Sainath Grandhi <sainath.grandhi@intel.com>");

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS("NETDEV_INTERNAL");

drivers/net/tun.c

+2 −1
Original line number Diff line number Diff line
@@ -3223,7 +3223,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, 


	case SIOCGIFHWADDR:

		/* Get hw address */

		dev_get_mac_address(&ifr.ifr_hwaddr, net, tun->dev->name);

		netif_get_mac_address(&ifr.ifr_hwaddr, net, tun->dev->name);

		if (copy_to_user(argp, &ifr, ifreq_len))

			ret = -EFAULT;

		break;
@@ -3732,3 +3732,4 @@ MODULE_AUTHOR(DRV_COPYRIGHT); 
MODULE_LICENSE("GPL");

MODULE_ALIAS_MISCDEV(TUN_MINOR);

MODULE_ALIAS("devname:net/tun");

MODULE_IMPORT_NS("NETDEV_INTERNAL");

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -4222,7 +4222,7 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss, 
			struct netlink_ext_ack *extack);

int dev_set_mac_address_user(struct net_device *dev, struct sockaddr_storage *ss,

			     struct netlink_ext_ack *extack);

int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name);

int netif_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name);

int netif_get_port_parent_id(struct net_device *dev,

			     struct netdev_phys_item_id *ppid, bool recurse);

bool netdev_port_same_parent_id(struct net_device *a, struct net_device *b);

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -9765,7 +9765,7 @@ int netif_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss, 
DECLARE_RWSEM(dev_addr_sem);



/* "sa" is a true struct sockaddr with limited "sa_data" member. */

int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name)

int netif_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name)

{

	size_t size = sizeof(sa->sa_data_min);

	struct net_device *dev;
@@ -9791,7 +9791,7 @@ int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name) 
	up_read(&dev_addr_sem);

	return ret;

}

EXPORT_SYMBOL(dev_get_mac_address);

EXPORT_SYMBOL_NS_GPL(netif_get_mac_address, "NETDEV_INTERNAL");



int netif_change_carrier(struct net_device *dev, bool new_carrier)

{

net/core/dev_ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -728,7 +728,8 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, 
	switch (cmd) {

	case SIOCGIFHWADDR:

		dev_load(net, ifr->ifr_name);

		ret = dev_get_mac_address(&ifr->ifr_hwaddr, net, ifr->ifr_name);

		ret = netif_get_mac_address(&ifr->ifr_hwaddr, net,

					    ifr->ifr_name);

		if (colon)

			*colon = ':';

		return ret;