|
@@ -4139,6 +4139,8 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev,
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
if (!info->linking)
|
|
if (!info->linking)
|
|
break;
|
|
break;
|
|
|
|
+ if (netdev_has_any_upper_dev(upper_dev))
|
|
|
|
+ return -EINVAL;
|
|
if (netif_is_lag_master(upper_dev) &&
|
|
if (netif_is_lag_master(upper_dev) &&
|
|
!mlxsw_sp_master_lag_check(mlxsw_sp, upper_dev,
|
|
!mlxsw_sp_master_lag_check(mlxsw_sp, upper_dev,
|
|
info->upper_info))
|
|
info->upper_info))
|
|
@@ -4258,6 +4260,10 @@ static int mlxsw_sp_netdevice_port_vlan_event(struct net_device *vlan_dev,
|
|
upper_dev = info->upper_dev;
|
|
upper_dev = info->upper_dev;
|
|
if (!netif_is_bridge_master(upper_dev))
|
|
if (!netif_is_bridge_master(upper_dev))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
+ if (!info->linking)
|
|
|
|
+ break;
|
|
|
|
+ if (netdev_has_any_upper_dev(upper_dev))
|
|
|
|
+ return -EINVAL;
|
|
break;
|
|
break;
|
|
case NETDEV_CHANGEUPPER:
|
|
case NETDEV_CHANGEUPPER:
|
|
upper_dev = info->upper_dev;
|
|
upper_dev = info->upper_dev;
|