git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
bridge
/
br_stp_if.c
diff --git
a/net/bridge/br_stp_if.c
b/net/bridge/br_stp_if.c
index
14cd025
..
d294224
100644
(file)
--- 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)
del_timer(&p->forward_delay_timer);
del_timer(&p->hold_timer);
+ br_fdb_delete_by_port(br, p, 0);
+
br_configuration_update(br);
br_port_state_selection(br);