From c2e36f12387394080e7a25d4d83704a594e52015 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jiri@resnulli.us>
Date: Thu, 23 Aug 2012 03:26:53 +0000
Subject: [PATCH] --- yaml --- r: 327622 b: refs/heads/master c:
 2c33bb37cb69dc6d86d2ee8edd1d4814990a65fe h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/team/team.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b45c38034b0..26d90cdcc9cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b361c13ceeae872161175d39f4798ee345ed10c
+refs/heads/master: 2c33bb37cb69dc6d86d2ee8edd1d4814990a65fe
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
index a5926c8584aa..b4f67b55ef79 100644
--- a/trunk/drivers/net/team/team.c
+++ b/trunk/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;