Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Overlapping changes in selftests Makefile. Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-04 09:58:56 -04:00
parent b05f03b232 1504269814
commit a7b15ab887
424 changed files with 3845 additions and 2413 deletions
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -523,8 +523,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,
 		return -ELOOP;
 	}

-	/* Device is already being bridged */
-	if (br_port_exists(dev))
+	/* Device has master upper dev */
+	if (netdev_master_upper_dev_get(dev))
 		return -EBUSY;

 	/* No bridging devices that dislike that (e.g. wireless) */