From: Jiri Pirko <jiri@resnulli.us>
Date: Thu, 23 Aug 2012 03:26:53 +0000 (+0000)
Subject: team: do not allow to add VLAN challenged port when vlan is used
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2c33bb37cb69dc6d86d2ee8edd1d4814990a65fe;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

Reported-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index a5926c8584aa..b4f67b55ef79 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -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;