---

yaml --- r: 193638 b: refs/heads/master c: 283f2fe h: refs/heads/master v: v3
git-mirror · Mar 22, 2010 · 7cf253f · 7cf253f
1 parent 4eb939f
commit 7cf253f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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