---

yaml --- r: 9840 b: refs/heads/master c: ab4060e h: refs/heads/master v: v3
git-mirror · Oct 12, 2005 · c644030 · c644030
1 parent 457e794
commit c644030
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeb2b8560676e454ad37ee30b49bc7d897edc9be
+refs/heads/master: ab4060e858e36129f9319ef0fa055347ad60e1d5
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -79,7 +79,6 @@ static void destroy_nbp(struct net_bridge_port *p)
 {
 	struct net_device *dev = p->dev;
 
-	dev->br_port = NULL;
 	p->br = NULL;
 	p->dev = NULL;
 	dev_put(dev);
@@ -100,6 +99,7 @@ static void del_nbp(struct net_bridge_port *p)
 	struct net_bridge *br = p->br;
 	struct net_device *dev = p->dev;
 
+	dev->br_port = NULL;
 	dev_set_promiscuity(dev, -1);
 
 	spin_lock_bh(&br->lock);