Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dff37b58 authored by Nogah Frankel's avatar Nogah Frankel Committed by David S. Miller
Browse files

mlxsw: spectrum_switchdev: Change mc_router to mrouter 



Change the naming of mc_router to mrouter to keep consistency.

Signed-off-by: default avatarNogah Frankel <nogahf@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34929cb4

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+9 −9
Original line number Diff line number Diff line
@@ -699,10 +699,10 @@ static int mlxsw_sp_port_attr_br_vlan_set(struct mlxsw_sp_port *mlxsw_sp_port, 
	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 net_device *orig_dev,

					    bool is_port_mc_router)

					  bool is_port_mrouter)

{

	struct mlxsw_sp_bridge_port *bridge_port;

	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,

						   MLXSW_SP_FLOOD_TYPE_MC,

						   is_port_mc_router);

						   is_port_mrouter);

	if (err)

		return err;



out:

	bridge_port->mrouter = is_port_mc_router;

	bridge_port->mrouter = is_port_mrouter;

	return 0;

}
@@ -793,7 +793,7 @@ static int mlxsw_sp_port_attr_set(struct net_device *dev, 
						     attr->u.vlan_filtering);

		break;

	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->u.mrouter);

		break;