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

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

mlxsw: spectrum: Make VLAN deletion function symmetric 



Commit 05978481 ("mlxsw: spectrum: Create PVID vPort before
registering netdevice") removed __mlxsw_sp_port_vlans_del() from the
init sequence of the driver, which forced it to be non-symmetric with
regards to __mlxsw_sp_port_vlans_add().

Make both functions symmetric as the constraint no longer exists.

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 1803e0fb

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

+8 −8
Original line number Diff line number Diff line
@@ -1008,14 +1008,6 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port, 
	if (!mlxsw_sp_port->bridged)

		return -EINVAL;



	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;

	}



	pvid = mlxsw_sp_port->pvid;

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

		err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, 0);
@@ -1025,6 +1017,14 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port, 
		}

	}



	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_fid_leave(mlxsw_sp_port, vid_begin, vid_end);



	/* Changing activity bits only if HW operation succeded */