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

net: s/dev_get_port_parent_id/netif_get_port_parent_id/ 



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.

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


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

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -5446,7 +5446,7 @@ int mlx5e_tc_esw_init(struct mlx5_rep_uplink_priv *uplink_priv) 
		goto err_action_counter;

	}



	err = dev_get_port_parent_id(priv->netdev, &ppid, false);

	err = netif_get_port_parent_id(priv->netdev, &ppid, false);

	if (!err) {

		memcpy(&key, &ppid.id, sizeof(key));

		mlx5_esw_offloads_devcom_init(esw, key);

include/linux/netdevice.h

+2 −2
Original line number Diff line number Diff line
@@ -4223,7 +4223,7 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss, 
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 dev_get_port_parent_id(struct net_device *dev,

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/bridge/br_switchdev.c

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ int br_switchdev_port_offload(struct net_bridge_port *p, 
	struct netdev_phys_item_id ppid;

	int err;



	err = dev_get_port_parent_id(dev, &ppid, false);

	err = netif_get_port_parent_id(dev, &ppid, false);

	if (err)

		return err;

net/core/dev.c

+13 −12
Original line number Diff line number Diff line
@@ -9844,16 +9844,17 @@ int dev_get_phys_port_name(struct net_device *dev, 
}



/**

 *	dev_get_port_parent_id - Get the device's port parent identifier

 * netif_get_port_parent_id() - Get the device's port parent identifier

 * @dev: network device

 * @ppid: pointer to a storage for the port's parent identifier

 * @recurse: allow/disallow recursion to lower devices

 *

 *	Get the devices's port parent identifier

 * Get the devices's port parent identifier.

 *

 * Return: 0 on success, -errno on failure.

 */

int dev_get_port_parent_id(struct net_device *dev,

			   struct netdev_phys_item_id *ppid,

			   bool recurse)

int netif_get_port_parent_id(struct net_device *dev,

			     struct netdev_phys_item_id *ppid, bool recurse)

{

	const struct net_device_ops *ops = dev->netdev_ops;

	struct netdev_phys_item_id first = { };
@@ -9872,7 +9873,7 @@ int dev_get_port_parent_id(struct net_device *dev, 
		return err;



	netdev_for_each_lower_dev(dev, lower_dev, iter) {

		err = dev_get_port_parent_id(lower_dev, ppid, true);

		err = netif_get_port_parent_id(lower_dev, ppid, true);

		if (err)

			break;

		if (!first.id_len)
@@ -9883,7 +9884,7 @@ int dev_get_port_parent_id(struct net_device *dev, 


	return err;

}

EXPORT_SYMBOL(dev_get_port_parent_id);

EXPORT_SYMBOL(netif_get_port_parent_id);



/**

 *	netdev_port_same_parent_id - Indicate if two network devices have
@@ -9896,8 +9897,8 @@ bool netdev_port_same_parent_id(struct net_device *a, struct net_device *b) 
	struct netdev_phys_item_id a_id = { };

	struct netdev_phys_item_id b_id = { };



	if (dev_get_port_parent_id(a, &a_id, true) ||

	    dev_get_port_parent_id(b, &b_id, true))

	if (netif_get_port_parent_id(a, &a_id, true) ||

	    netif_get_port_parent_id(b, &b_id, true))

		return false;



	return netdev_phys_item_id_same(&a_id, &b_id);

net/core/net-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static ssize_t phys_switch_id_show(struct device *dev, 
	if (ret)

		return ret;



	ret = dev_get_port_parent_id(netdev, &ppid, false);

	ret = netif_get_port_parent_id(netdev, &ppid, false);

	if (!ret)

		ret = sysfs_emit(buf, "%*phN\n", ppid.id_len, ppid.id);