diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-12 19:07:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-12 19:07:59 -0700 |
| commit | 02d31ed258434b29eb0e3a10f5ede6eecd46b6ba (patch) | |
| tree | e901ed8af00756086e2da1a5e0c52602d2b01603 /net/bridge/br_if.c | |
| parent | 1b66e9fe8523cc239b6bea8443a860f50aeb2a83 (diff) | |
| parent | 9ff5c59ce278c37bca22fbf98076d199bcaf9845 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 91bb895375f..defcf6a8607 100644 --- a/net/bridge/br_if.c +++ b/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); |