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

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

mlxsw: spectrum: Forbid LAG slave from having VLAN uppers 



When a port netdev is put under LAG it cannot have VLAN upper devices,
so forbid that. The LAG device itself can have VLAN upper devices.

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 59fe9b3f

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

+6 −1
Original line number Diff line number Diff line
@@ -3038,7 +3038,7 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *dev, 
		    !netif_is_lag_master(upper_dev) &&

		    !netif_is_bridge_master(upper_dev))

			return -EINVAL;

		if (!info->master || !info->linking)

		if (!info->linking)

			break;

		/* HW limitation forbids to put ports to multiple bridges. */

		if (netif_is_bridge_master(upper_dev) &&
@@ -3048,6 +3048,11 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *dev, 
		    !mlxsw_sp_master_lag_check(mlxsw_sp, upper_dev,

					       info->upper_info))

			return -EINVAL;

		if (netif_is_lag_master(upper_dev) && vlan_uses_dev(dev))

			return -EINVAL;

		if (netif_is_lag_port(dev) && is_vlan_dev(upper_dev) &&

		    !netif_is_lag_master(vlan_dev_real_dev(upper_dev)))

			return -EINVAL;

		break;

	case NETDEV_CHANGEUPPER:

		upper_dev = info->upper_dev;