diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-04-25 23:52:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-25 23:52:29 -0400 |
| commit | 8b4483658364f05b2e32845c8f445cdfd9452286 (patch) | |
| tree | 4734ef83378b1e90475ec4776ac72dfe16a7249b /drivers/net/team/team.c | |
| parent | net: sched: flower: refactor reoffload for concurrent access (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-8b4483658364f05b2e32845c8f445cdfd9452286.tar.xz linux-dev-8b4483658364f05b2e32845c8f445cdfd9452286.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two easy cases of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team/team.c')
| -rw-r--r-- | drivers/net/team/team.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 699a8870e928..eb4711bfc52a 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1154,6 +1154,13 @@ static int team_port_add(struct team *team, struct net_device *port_dev, return -EINVAL; } + if (netdev_has_upper_dev(dev, port_dev)) { + NL_SET_ERR_MSG(extack, "Device is already an upper device of the team interface"); + netdev_err(dev, "Device %s is already an upper device of the team interface\n", + portname); + return -EBUSY; + } + if (port_dev->features & NETIF_F_VLAN_CHALLENGED && vlan_uses_dev(dev)) { NL_SET_ERR_MSG(extack, "Device is VLAN challenged and team device has VLAN set up"); |