GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-18 04:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mlxsw: spectrum_switchdev: Change mc_router to mrouter

Browse source 
Change the naming of mc_router to mrouter to keep consistency.

Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nogah Frankel 2017-09-20 16:15:01 +02:00 • committed by David S. Miller
parent 34929cb4d6
commit dff37b58ca
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
View file

@ -699,10 +699,10 @@ static int mlxsw_sp_port_attr_br_vlan_set(struct mlxsw_sp_port *mlxsw_sp_port,
return -EINVAL; return -EINVAL;
} }
static int mlxsw_sp_port_attr_mc_router_set(struct mlxsw_sp_port *mlxsw_sp_port, static int mlxsw_sp_port_attr_mrouter_set(struct mlxsw_sp_port *mlxsw_sp_port,
struct switchdev_trans *trans, struct switchdev_trans *trans,
struct net_device *orig_dev, struct net_device *orig_dev,
bool is_port_mc_router) bool is_port_mrouter)
{ {
struct mlxsw_sp_bridge_port *bridge_port; struct mlxsw_sp_bridge_port *bridge_port;
int err; int err;
@ -720,12 +720,12 @@ static int mlxsw_sp_port_attr_mc_router_set(struct mlxsw_sp_port *mlxsw_sp_port,
err = mlxsw_sp_bridge_port_flood_table_set(mlxsw_sp_port, bridge_port, err = mlxsw_sp_bridge_port_flood_table_set(mlxsw_sp_port, bridge_port,
MLXSW_SP_FLOOD_TYPE_MC, MLXSW_SP_FLOOD_TYPE_MC,
is_port_mc_router); is_port_mrouter);
if (err) if (err)
return err; return err;
out: out:
bridge_port->mrouter = is_port_mc_router; bridge_port->mrouter = is_port_mrouter;
return 0; return 0;
} }
@ -793,9 +793,9 @@ static int mlxsw_sp_port_attr_set(struct net_device *dev,
attr->u.vlan_filtering); attr->u.vlan_filtering);
break; break;
case SWITCHDEV_ATTR_ID_PORT_MROUTER: case SWITCHDEV_ATTR_ID_PORT_MROUTER:
err = mlxsw_sp_port_attr_mc_router_set(mlxsw_sp_port, trans, err = mlxsw_sp_port_attr_mrouter_set(mlxsw_sp_port, trans,
attr->orig_dev, attr->orig_dev,
attr->u.mrouter); attr->u.mrouter);
break; break;
case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED: case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED:
err = mlxsw_sp_port_mc_disabled_set(mlxsw_sp_port, trans, err = mlxsw_sp_port_mc_disabled_set(mlxsw_sp_port, trans,