From c644030854853c37d2cb4076506767a845bca578 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Wed, 12 Oct 2005 15:10:01 -0700
Subject: [PATCH] --- yaml --- r: 9840 b: refs/heads/master c:
 ab4060e858e36129f9319ef0fa055347ad60e1d5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 64169b8ffc35..f3b6cb4f2b1b 100644
--- 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
index 91bb895375f4..defcf6a8607c 100644
--- 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);