You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
76 lines
3.1 KiB
76 lines
3.1 KiB
4 years ago
|
From 600067e1c77c62514d29e347a97a470429302ce5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Mon, 1 Jun 2020 15:40:24 -0400
|
||
|
|
Subject: [PATCH 272/312] [netdrv] net/mlx5e: Rename representor get devlink
|
||
|
|
port function
|
||
|
|
|
||
|
|
Message-id: <20200601154102.25980-2-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 315706
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1842258 01/39] net/mlx5e: Rename representor get devlink port function
|
||
|
|
Bugzilla: 1842258 1790226
|
||
|
|
RH-Acked-by: Honggang Li <honli@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Marcelo Leitner <mleitner@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1790226
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1842258
|
||
|
|
Upstream: v5.7-rc1
|
||
|
|
|
||
|
|
commit ab8f963a11790ea0a04add0538c5e45887890d46
|
||
|
|
Author: Vladyslav Tarasiuk <vladyslavt@mellanox.com>
|
||
|
|
Date: Fri Jan 17 12:42:53 2020 +0200
|
||
|
|
|
||
|
|
net/mlx5e: Rename representor get devlink port function
|
||
|
|
|
||
|
|
Rename representor's mlx5e_get_devlink_port() to
|
||
|
|
mlx5e_rep_get_devlink_port().
|
||
|
|
The downstream patch will add a non-representor mlx5e function called
|
||
|
|
mlx5e_get_devlink_phy_port().
|
||
|
|
|
||
|
|
Signed-off-by: Vladyslav Tarasiuk <vladyslavt@mellanox.com>
|
||
|
|
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
index 797ecdb6a165..00213299e616 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
@@ -1382,7 +1382,7 @@ static int mlx5e_uplink_rep_set_vf_vlan(struct net_device *dev, int vf, u16 vlan
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static struct devlink_port *mlx5e_get_devlink_port(struct net_device *dev)
|
||
|
|
+static struct devlink_port *mlx5e_rep_get_devlink_port(struct net_device *dev)
|
||
|
|
{
|
||
|
|
struct mlx5e_priv *priv = netdev_priv(dev);
|
||
|
|
struct mlx5e_rep_priv *rpriv = priv->ppriv;
|
||
|
|
@@ -1395,7 +1395,7 @@ static const struct net_device_ops mlx5e_netdev_ops_rep = {
|
||
|
|
.ndo_stop = mlx5e_rep_close,
|
||
|
|
.ndo_start_xmit = mlx5e_xmit,
|
||
|
|
.ndo_setup_tc = mlx5e_rep_setup_tc,
|
||
|
|
- .ndo_get_devlink_port = mlx5e_get_devlink_port,
|
||
|
|
+ .ndo_get_devlink_port = mlx5e_rep_get_devlink_port,
|
||
|
|
.ndo_get_stats64 = mlx5e_rep_get_stats,
|
||
|
|
.ndo_has_offload_stats = mlx5e_rep_has_offload_stats,
|
||
|
|
.ndo_get_offload_stats = mlx5e_rep_get_offload_stats,
|
||
|
|
@@ -1408,7 +1408,7 @@ static const struct net_device_ops mlx5e_netdev_ops_uplink_rep = {
|
||
|
|
.ndo_start_xmit = mlx5e_xmit,
|
||
|
|
.ndo_set_mac_address = mlx5e_uplink_rep_set_mac,
|
||
|
|
.ndo_setup_tc = mlx5e_rep_setup_tc,
|
||
|
|
- .ndo_get_devlink_port = mlx5e_get_devlink_port,
|
||
|
|
+ .ndo_get_devlink_port = mlx5e_rep_get_devlink_port,
|
||
|
|
.ndo_get_stats64 = mlx5e_get_stats,
|
||
|
|
.ndo_has_offload_stats = mlx5e_rep_has_offload_stats,
|
||
|
|
.ndo_get_offload_stats = mlx5e_rep_get_offload_stats,
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|