From 234c72617300489a2d3fbd5d10118a36088aee15 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 19 May 2011 19:37:40 +0000
Subject: [PATCH] --- yaml --- r: 247968 b: refs/heads/master c:
 6df427fe8c481d3be437cbe8bd366bdac82b73c4 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/bridge/br_if.c | 1 +
 trunk/net/core/dev.c     | 4 +---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 138a630ca532..8cddedd80f40 100644
--- 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
index d5147ddd70bf..1bacca4cb676 100644
--- 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
index d94537914a71..bcb05cb799c1 100644
--- 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);