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

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

mlxsw: spectrum: Don't abort on first error when removing VLANs 



When removing VLANs from the VLAN-aware bridge we shouldn't abort on the
first error, as we'll otherwise have resources that will never be freed.

Signed-off-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 f7a8f6ce

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

+4 −16
Original line number Diff line number Diff line
@@ -1001,29 +1001,17 @@ static int mlxsw_sp_port_obj_add(struct net_device *dev, 
static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port,

				     u16 vid_begin, u16 vid_end)

{

	struct net_device *dev = mlxsw_sp_port->dev;

	u16 vid, pvid;

	int err;



	if (!mlxsw_sp_port->bridged)

		return -EINVAL;



	pvid = mlxsw_sp_port->pvid;

	if (pvid >= vid_begin && pvid <= vid_end) {

		err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, 0);

		if (err) {

			netdev_err(dev, "Unable to del PVID %d\n", pvid);

			return err;

		}

	}

	if (pvid >= vid_begin && pvid <= vid_end)

		mlxsw_sp_port_pvid_set(mlxsw_sp_port, 0);



	err = __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end,

					false, false);

	if (err) {

		netdev_err(dev, "Unable to del VIDs %d-%d\n", vid_begin,

			   vid_end);

		return err;

	}

	__mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end, false,

				  false);



	mlxsw_sp_port_fid_leave(mlxsw_sp_port, vid_begin, vid_end);