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

Commit c360867e authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Delete RIF when VLAN device is removed 



In commit 602b74ed ("mlxsw: spectrum_switchdev: Do not leak RIFs
when removing bridge") I handled the case where RIFs created for VLAN
devices were not properly cleaned up when their real device (a bridge)
was removed.

However, I forgot to handle the case of the VLAN device itself being
removed. Do so now when the VLAN device is being unlinked from its real
device.

Fixes: 99f44bb3 ("mlxsw: spectrum: Enable L3 interfaces on top of bridge devices")
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Reported-by: default avatarArtem Shvorin <art@qrator.net>
Tested-by: default avatarArtem Shvorin <art@qrator.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3c84a8e

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

+2 −0
Original line number Diff line number Diff line
@@ -4845,6 +4845,8 @@ static int mlxsw_sp_netdevice_bridge_event(struct net_device *br_dev, 
		upper_dev = info->upper_dev;

		if (info->linking)

			break;

		if (is_vlan_dev(upper_dev))

			mlxsw_sp_rif_destroy_by_dev(mlxsw_sp, upper_dev);

		if (netif_is_macvlan(upper_dev))

			mlxsw_sp_rif_macvlan_del(mlxsw_sp, upper_dev);

		break;