Skip to content

Commit ffea116

Browse files
Stanislav Fomichevkuba-moo
authored andcommitted
net: s/dev_get_port_parent_id/netif_get_port_parent_id/
Commit cc34acd ("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 <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 25250f4 commit ffea116

File tree

7 files changed

+20
-19
lines changed

7 files changed

+20
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5446,7 +5446,7 @@ int mlx5e_tc_esw_init(struct mlx5_rep_uplink_priv *uplink_priv)
54465446
goto err_action_counter;
54475447
}
54485448

5449-
err = dev_get_port_parent_id(priv->netdev, &ppid, false);
5449+
err = netif_get_port_parent_id(priv->netdev, &ppid, false);
54505450
if (!err) {
54515451
memcpy(&key, &ppid.id, sizeof(key));
54525452
mlx5_esw_offloads_devcom_init(esw, key);

include/linux/netdevice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4223,8 +4223,8 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr_storage *ss,
42234223
int dev_set_mac_address_user(struct net_device *dev, struct sockaddr_storage *ss,
42244224
struct netlink_ext_ack *extack);
42254225
int dev_get_mac_address(struct sockaddr *sa, struct net *net, char *dev_name);
4226-
int dev_get_port_parent_id(struct net_device *dev,
4227-
struct netdev_phys_item_id *ppid, bool recurse);
4226+
int netif_get_port_parent_id(struct net_device *dev,
4227+
struct netdev_phys_item_id *ppid, bool recurse);
42284228
bool netdev_port_same_parent_id(struct net_device *a, struct net_device *b);
42294229

42304230
struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev, bool *again);

net/bridge/br_switchdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ int br_switchdev_port_offload(struct net_bridge_port *p,
837837
struct netdev_phys_item_id ppid;
838838
int err;
839839

840-
err = dev_get_port_parent_id(dev, &ppid, false);
840+
err = netif_get_port_parent_id(dev, &ppid, false);
841841
if (err)
842842
return err;
843843

net/core/dev.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9844,16 +9844,17 @@ int dev_get_phys_port_name(struct net_device *dev,
98449844
}
98459845

98469846
/**
9847-
* dev_get_port_parent_id - Get the device's port parent identifier
9848-
* @dev: network device
9849-
* @ppid: pointer to a storage for the port's parent identifier
9850-
* @recurse: allow/disallow recursion to lower devices
9847+
* netif_get_port_parent_id() - Get the device's port parent identifier
9848+
* @dev: network device
9849+
* @ppid: pointer to a storage for the port's parent identifier
9850+
* @recurse: allow/disallow recursion to lower devices
9851+
*
9852+
* Get the devices's port parent identifier.
98519853
*
9852-
* Get the devices's port parent identifier
9854+
* Return: 0 on success, -errno on failure.
98539855
*/
9854-
int dev_get_port_parent_id(struct net_device *dev,
9855-
struct netdev_phys_item_id *ppid,
9856-
bool recurse)
9856+
int netif_get_port_parent_id(struct net_device *dev,
9857+
struct netdev_phys_item_id *ppid, bool recurse)
98579858
{
98589859
const struct net_device_ops *ops = dev->netdev_ops;
98599860
struct netdev_phys_item_id first = { };
@@ -9872,7 +9873,7 @@ int dev_get_port_parent_id(struct net_device *dev,
98729873
return err;
98739874

98749875
netdev_for_each_lower_dev(dev, lower_dev, iter) {
9875-
err = dev_get_port_parent_id(lower_dev, ppid, true);
9876+
err = netif_get_port_parent_id(lower_dev, ppid, true);
98769877
if (err)
98779878
break;
98789879
if (!first.id_len)
@@ -9883,7 +9884,7 @@ int dev_get_port_parent_id(struct net_device *dev,
98839884

98849885
return err;
98859886
}
9886-
EXPORT_SYMBOL(dev_get_port_parent_id);
9887+
EXPORT_SYMBOL(netif_get_port_parent_id);
98879888

98889889
/**
98899890
* 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)
98969897
struct netdev_phys_item_id a_id = { };
98979898
struct netdev_phys_item_id b_id = { };
98989899

9899-
if (dev_get_port_parent_id(a, &a_id, true) ||
9900-
dev_get_port_parent_id(b, &b_id, true))
9900+
if (netif_get_port_parent_id(a, &a_id, true) ||
9901+
netif_get_port_parent_id(b, &b_id, true))
99019902
return false;
99029903

99039904
return netdev_phys_item_id_same(&a_id, &b_id);

net/core/net-sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ static ssize_t phys_switch_id_show(struct device *dev,
687687
if (ret)
688688
return ret;
689689

690-
ret = dev_get_port_parent_id(netdev, &ppid, false);
690+
ret = netif_get_port_parent_id(netdev, &ppid, false);
691691
if (!ret)
692692
ret = sysfs_emit(buf, "%*phN\n", ppid.id_len, ppid.id);
693693

net/core/rtnetlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1448,7 +1448,7 @@ static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)
14481448
struct netdev_phys_item_id ppid = { };
14491449
int err;
14501450

1451-
err = dev_get_port_parent_id(dev, &ppid, false);
1451+
err = netif_get_port_parent_id(dev, &ppid, false);
14521452
if (err) {
14531453
if (err == -EOPNOTSUPP)
14541454
return 0;

net/ipv4/ipmr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ static int vif_add(struct net *net, struct mr_table *mrt,
901901
vifc->vifc_flags | (!mrtsock ? VIFF_STATIC : 0),
902902
(VIFF_TUNNEL | VIFF_REGISTER));
903903

904-
err = dev_get_port_parent_id(dev, &ppid, true);
904+
err = netif_get_port_parent_id(dev, &ppid, true);
905905
if (err == 0) {
906906
memcpy(v->dev_parent_id.id, ppid.id, ppid.id_len);
907907
v->dev_parent_id.id_len = ppid.id_len;

0 commit comments

Comments
 (0)