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

Commit 28c8d59c authored by Ido Schimmel's avatar Ido Schimmel Committed by Greg Kroah-Hartman
Browse files

mlxsw: spectrum_switchdev: Set PVID correctly during VLAN deletion 



[ Upstream commit 674bed5df4cab8f96d04f7b99608883a48f9226b ]

When a VLAN is deleted from a bridge port we should not change the PVID
unless the deleted VLAN is the PVID.

Fixes: fe9ccc78 ("mlxsw: spectrum_switchdev: Don't batch VLAN operations")
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da689d5e

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

+1 −1
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ static void 
mlxsw_sp_bridge_port_vlan_del(struct mlxsw_sp_port *mlxsw_sp_port,

			      struct mlxsw_sp_bridge_port *bridge_port, u16 vid)

{

	u16 pvid = mlxsw_sp_port->pvid == vid ? 0 : vid;

	u16 pvid = mlxsw_sp_port->pvid == vid ? 0 : mlxsw_sp_port->pvid;

	struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;



	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_vid(mlxsw_sp_port, vid);