From 7cf253f876a510aa0aa2b5748444b0b9d0be202d Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 18 Mar 2010 13:37:40 +0000
Subject: [PATCH] --- yaml --- r: 193638 b: refs/heads/master c:
 283f2fe87e980d8af5ad8aa63751e7e3258ee05a h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b77bf5329200..391b3f363be8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 907cdda5205b012eec7513f66713749b293188c9
+refs/heads/master: 283f2fe87e980d8af5ad8aa63751e7e3258ee05a
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index fe2a754238a9..2d01f18f303a 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -3757,11 +3757,10 @@ int netdev_set_master(struct net_device *slave, struct net_device *master)
 
 	slave->master = master;
 
-	synchronize_net();
-
-	if (old)
+	if (old) {
+		synchronize_net();
 		dev_put(old);
-
+	}
 	if (master)
 		slave->flags |= IFF_SLAVE;
 	else