Commit 2c33bb37 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

team: do not allow to add VLAN challenged port when vlan is used 



Reported-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b361c13

drivers/net/team/team.c

+7 −0
Original line number Diff line number Diff line
@@ -989,6 +989,13 @@ static int team_port_add(struct team *team, struct net_device *port_dev) 
		return -EBUSY;

	}



	if (port_dev->features & NETIF_F_VLAN_CHALLENGED &&

	    vlan_uses_dev(dev)) {

		netdev_err(dev, "Device %s is VLAN challenged and team device has VLAN set up\n",

			   portname);

		return -EPERM;

	}



	err = team_dev_type_check_change(dev, port_dev);

	if (err)

		return err;