---

yaml --- r: 247968 b: refs/heads/master c: 6df427f h: refs/heads/master v: v3
git-mirror · May 23, 2011 · 234c726 · 234c726
1 parent 64d4f17
commit 234c726
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac3d3f81516fcbf80416e84682fd4bdaf3080611
+refs/heads/master: 6df427fe8c481d3be437cbe8bd366bdac82b73c4
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -147,6 +147,7 @@ static void del_nbp(struct net_bridge_port *p)
 	dev->priv_flags &= ~IFF_BRIDGE_PORT;
 
 	netdev_rx_handler_unregister(dev);
+	synchronize_net();
 
 	netdev_set_master(dev, NULL);
 

diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -4294,10 +4294,8 @@ int netdev_set_master(struct net_device *slave, struct net_device *master)
 
 	slave->master = master;
 
-	if (old) {
-		synchronize_net();
+	if (old)
 		dev_put(old);
-	}
 	return 0;
 }
 EXPORT_SYMBOL(netdev_set_master);