summaryrefslogtreecommitdiff
path: root/net/dsa/switch.c
diff options
context:
space:
mode:
authorVladimir Oltean <vladimir.oltean@nxp.com>2022-02-23 16:00:44 +0200
committerVladimir Oltean <vladimir.oltean@nxp.com>2022-05-04 15:24:54 +0200
commit7665ea738f339bf4bc2b90fbffaf362242ec4649 (patch)
treeb1b409bcaf10ff3ae49ef2dcc31abed746f1bf36 /net/dsa/switch.c
parentecbc3ac1c34f67fb4bb7f1513692b746dc16338d (diff)
net: dsa: rename references to "lag" as "lag_dev"
In preparation of converting struct net_device *dp->lag_dev into a struct dsa_lag *dp->lag, we need to rename, for consistency purposes, all occurrences of the "lag" variable in the DSA core to "lag_dev". Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit 46a76724e4c93bb1cda8ee11276001a92d1f7987) Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Diffstat (limited to 'net/dsa/switch.c')
-rw-r--r--net/dsa/switch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dsa/switch.c b/net/dsa/switch.c
index 5ad039fbe390..5736a5a57fe3 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
@@ -454,12 +454,12 @@ static int dsa_switch_lag_join(struct dsa_switch *ds,
struct dsa_notifier_lag_info *info)
{
if (ds->index == info->sw_index && ds->ops->port_lag_join)
- return ds->ops->port_lag_join(ds, info->port, info->lag,
+ return ds->ops->port_lag_join(ds, info->port, info->lag_dev,
info->info);
if (ds->index != info->sw_index && ds->ops->crosschip_lag_join)
return ds->ops->crosschip_lag_join(ds, info->sw_index,
- info->port, info->lag,
+ info->port, info->lag_dev,
info->info);
return -EOPNOTSUPP;
@@ -469,11 +469,11 @@ static int dsa_switch_lag_leave(struct dsa_switch *ds,
struct dsa_notifier_lag_info *info)
{
if (ds->index == info->sw_index && ds->ops->port_lag_leave)
- return ds->ops->port_lag_leave(ds, info->port, info->lag);
+ return ds->ops->port_lag_leave(ds, info->port, info->lag_dev);
if (ds->index != info->sw_index && ds->ops->crosschip_lag_leave)
return ds->ops->crosschip_lag_leave(ds, info->sw_index,
- info->port, info->lag);
+ info->port, info->lag_dev);
return -EOPNOTSUPP;
}