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>
This commit is contained in:
committed by
Jakub Kicinski
parent
89183b6ea8
commit
46a76724e4
@@ -182,12 +182,12 @@ static inline struct net_device *dsa_lag_dev(struct dsa_switch_tree *dst,
|
||||
}
|
||||
|
||||
static inline int dsa_lag_id(struct dsa_switch_tree *dst,
|
||||
struct net_device *lag)
|
||||
struct net_device *lag_dev)
|
||||
{
|
||||
unsigned int id;
|
||||
|
||||
dsa_lags_foreach_id(id, dst) {
|
||||
if (dsa_lag_dev(dst, id) == lag)
|
||||
if (dsa_lag_dev(dst, id) == lag_dev)
|
||||
return id;
|
||||
}
|
||||
|
||||
@@ -966,10 +966,10 @@ struct dsa_switch_ops {
|
||||
int (*crosschip_lag_change)(struct dsa_switch *ds, int sw_index,
|
||||
int port);
|
||||
int (*crosschip_lag_join)(struct dsa_switch *ds, int sw_index,
|
||||
int port, struct net_device *lag,
|
||||
int port, struct net_device *lag_dev,
|
||||
struct netdev_lag_upper_info *info);
|
||||
int (*crosschip_lag_leave)(struct dsa_switch *ds, int sw_index,
|
||||
int port, struct net_device *lag);
|
||||
int port, struct net_device *lag_dev);
|
||||
|
||||
/*
|
||||
* PTP functionality
|
||||
@@ -1041,10 +1041,10 @@ struct dsa_switch_ops {
|
||||
*/
|
||||
int (*port_lag_change)(struct dsa_switch *ds, int port);
|
||||
int (*port_lag_join)(struct dsa_switch *ds, int port,
|
||||
struct net_device *lag,
|
||||
struct net_device *lag_dev,
|
||||
struct netdev_lag_upper_info *info);
|
||||
int (*port_lag_leave)(struct dsa_switch *ds, int port,
|
||||
struct net_device *lag);
|
||||
struct net_device *lag_dev);
|
||||
|
||||
/*
|
||||
* HSR integration
|
||||
|
||||
Reference in New Issue
Block a user