net: s/dev_get_port_parent_id/netif_get_port_parent_id/

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.

Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250717172333.1288349-2-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index fef418e1ed1a0832fe6e23044c8bb63ec92a23f6..32c07a8b03d118d6f65380378ec760ea80b2a9fb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -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);

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e49d8c98d284bd8f8b0494d1d612c0694de511a1..c6ba4ea66039daae1bd970d8dc0325ac4333e16d 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4223,8 +4223,8 @@ 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,
-                          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);
 bool netdev_port_same_parent_id(struct net_device *a, struct net_device *b);
 
 struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev, bool *again);

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index 9a910cf0256e7133417645f1b7a7a755aa1869f9..fe3f7bbe86ee626827d14c6221c29603321ad67d 100644 (file)
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -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;
 

diff --git a/net/core/dev.c b/net/core/dev.c
index 59a9089117de07753ea1a4bb6ba04d15be6e6aec..4979a9197b18c4aba2c0a3083abffe6a1a5dabf5 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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
- *     @dev: network device
- *     @ppid: pointer to a storage for the port's parent identifier
- *     @recurse: allow/disallow recursion to lower devices
+ * 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);

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 8f897e2c8b4fe125a941f869709458830310169d..f7a6cc7aea79eecfb28044ffdcebea22efa05cae 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -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);
 

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index a9555bfc372f5709a3b846343986dce1edf935be..108995b6eced389208002cb3f1f698e5d6815283 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1448,7 +1448,7 @@ static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)
        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) {
                if (err == -EOPNOTSUPP)
                        return 0;

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 3a2044e6033d5683bda678489f6eaf72ea0b8890..e86a8a862c4117b9291754d9f0cb428cf87b4160 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -901,7 +901,7 @@ static int vif_add(struct net *net, struct mr_table *mrt,
                        vifc->vifc_flags | (!mrtsock ? VIFF_STATIC : 0),
                        (VIFF_TUNNEL | VIFF_REGISTER));
 
-       err = dev_get_port_parent_id(dev, &ppid, true);
+       err = netif_get_port_parent_id(dev, &ppid, true);
        if (err == 0) {
                memcpy(v->dev_parent_id.id, ppid.id, ppid.id_len);
                v->dev_parent_id.id_len = ppid.id_len;