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

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

mlxsw: spectrum_switchdev: Fix mrouter flag update 



Update the value of the mrouter flag in struct mlxsw_sp_bridge_port when
it is being changed.

Fixes: c57529e1 ("mlxsw: spectrum: Replace vPorts with Port-VLAN")
Signed-off-by: default avatarNogah Frankel <nogahf@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5160a153

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

+11 −4
Original line number Diff line number Diff line
@@ -705,6 +705,7 @@ static int mlxsw_sp_port_attr_mc_router_set(struct mlxsw_sp_port *mlxsw_sp_port, 
					    bool is_port_mc_router)

{

	struct mlxsw_sp_bridge_port *bridge_port;

	int err;



	if (switchdev_trans_ph_prepare(trans))

		return 0;
@@ -715,11 +716,17 @@ static int mlxsw_sp_port_attr_mc_router_set(struct mlxsw_sp_port *mlxsw_sp_port, 
		return 0;



	if (!bridge_port->bridge_device->multicast_enabled)

		return 0;

		goto out;



	return 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,

						   is_port_mc_router);

	if (err)

		return err;



out:

	bridge_port->mrouter = is_port_mc_router;

	return 0;

}



static int mlxsw_sp_port_mc_disabled_set(struct mlxsw_sp_port *mlxsw_sp_port,