mirror of https://gitee.com/openkylin/linux.git
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: Ido Schimmel <idosch@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
59fe9b3f84
commit
6ec439043b
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue