1 files changed, 7 insertions, 0 deletions

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;