[patch net-next 3/3] team: do not allow to add VLAN challenged port when vlan is used
From: Jiri Pirko <jiri@resnulli.us>
Date: 2012-08-23 13:27:22
Subsystem:
networking drivers, team driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jiri Pirko, Linus Torvalds
Reported-by: Or Gerlitz <redacted> Signed-off-by: Jiri Pirko <jiri@resnulli.us> --- drivers/net/team/team.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 4010bcd..49629fb 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;
--
1.7.11.4