diff options
-rw-r--r-- | net/bridge/br_fdb.c | 7 | ||||
-rw-r--r-- | net/bridge/br_if.c | 4 | ||||
-rw-r--r-- | net/bridge/br_private.h | 2 | ||||
-rw-r--r-- | net/bridge/br_stp_if.c | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 3a73b8c94271..d9f04864d15d 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
@@ -128,7 +128,10 @@ void br_fdb_cleanup(unsigned long _data) | |||
128 | mod_timer(&br->gc_timer, jiffies + HZ/10); | 128 | mod_timer(&br->gc_timer, jiffies + HZ/10); |
129 | } | 129 | } |
130 | 130 | ||
131 | void br_fdb_delete_by_port(struct net_bridge *br, struct net_bridge_port *p) | 131 | |
132 | void br_fdb_delete_by_port(struct net_bridge *br, | ||
133 | const struct net_bridge_port *p, | ||
134 | int do_all) | ||
132 | { | 135 | { |
133 | int i; | 136 | int i; |
134 | 137 | ||
@@ -142,6 +145,8 @@ void br_fdb_delete_by_port(struct net_bridge *br, struct net_bridge_port *p) | |||
142 | if (f->dst != p) | 145 | if (f->dst != p) |
143 | continue; | 146 | continue; |
144 | 147 | ||
148 | if (f->is_static && !do_all) | ||
149 | continue; | ||
145 | /* | 150 | /* |
146 | * if multiple ports all have the same device address | 151 | * if multiple ports all have the same device address |
147 | * then when one port is deleted, assign | 152 | * then when one port is deleted, assign |
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index b1211d5342f6..f753c40c11d2 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
@@ -163,7 +163,7 @@ static void del_nbp(struct net_bridge_port *p) | |||
163 | br_stp_disable_port(p); | 163 | br_stp_disable_port(p); |
164 | spin_unlock_bh(&br->lock); | 164 | spin_unlock_bh(&br->lock); |
165 | 165 | ||
166 | br_fdb_delete_by_port(br, p); | 166 | br_fdb_delete_by_port(br, p, 1); |
167 | 167 | ||
168 | list_del_rcu(&p->list); | 168 | list_del_rcu(&p->list); |
169 | 169 | ||
@@ -448,7 +448,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) | |||
448 | 448 | ||
449 | return 0; | 449 | return 0; |
450 | err2: | 450 | err2: |
451 | br_fdb_delete_by_port(br, p); | 451 | br_fdb_delete_by_port(br, p, 1); |
452 | err1: | 452 | err1: |
453 | kobject_del(&p->kobj); | 453 | kobject_del(&p->kobj); |
454 | err0: | 454 | err0: |
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index c491fb2f280e..74258d86f256 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -143,7 +143,7 @@ extern void br_fdb_changeaddr(struct net_bridge_port *p, | |||
143 | const unsigned char *newaddr); | 143 | const unsigned char *newaddr); |
144 | extern void br_fdb_cleanup(unsigned long arg); | 144 | extern void br_fdb_cleanup(unsigned long arg); |
145 | extern void br_fdb_delete_by_port(struct net_bridge *br, | 145 | extern void br_fdb_delete_by_port(struct net_bridge *br, |
146 | struct net_bridge_port *p); | 146 | const struct net_bridge_port *p, int do_all); |
147 | extern struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, | 147 | extern struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, |
148 | const unsigned char *addr); | 148 | const unsigned char *addr); |
149 | extern struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br, | 149 | extern struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br, |
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 14cd025079af..d294224592db 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c | |||
@@ -113,6 +113,8 @@ void br_stp_disable_port(struct net_bridge_port *p) | |||
113 | del_timer(&p->forward_delay_timer); | 113 | del_timer(&p->forward_delay_timer); |
114 | del_timer(&p->hold_timer); | 114 | del_timer(&p->hold_timer); |
115 | 115 | ||
116 | br_fdb_delete_by_port(br, p, 0); | ||
117 | |||
116 | br_configuration_update(br); | 118 | br_configuration_update(br); |
117 | 119 | ||
118 | br_port_state_selection(br); | 120 | br_port_state_selection(br); |