diff options
| -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 91bb895375f4..defcf6a8607c 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) | |||
| 79 | { | 79 | { |
| 80 | struct net_device *dev = p->dev; | 80 | struct net_device *dev = p->dev; |
| 81 | 81 | ||
| 82 | dev->br_port = NULL; | ||
| 83 | p->br = NULL; | 82 | p->br = NULL; |
| 84 | p->dev = NULL; | 83 | p->dev = NULL; |
| 85 | dev_put(dev); | 84 | dev_put(dev); |
| @@ -100,6 +99,7 @@ static void del_nbp(struct net_bridge_port *p) | |||
| 100 | struct net_bridge *br = p->br; | 99 | struct net_bridge *br = p->br; |
| 101 | struct net_device *dev = p->dev; | 100 | struct net_device *dev = p->dev; |
| 102 | 101 | ||
| 102 | dev->br_port = NULL; | ||
| 103 | dev_set_promiscuity(dev, -1); | 103 | dev_set_promiscuity(dev, -1); |
| 104 | 104 | ||
| 105 | spin_lock_bh(&br->lock); | 105 | spin_lock_bh(&br->lock); |
