diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-05-15 06:11:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-17 21:12:55 -0700 |
| commit | 4f0611af47e25807cf18cd2b4d4e94206c75b29e (patch) | |
| tree | b82d92125470b76caa4e2cf014abdc45ba7510d3 | |
| parent | a598f6aebea2481531b0757ed90cfb0d8cf1d8f5 (diff) | |
bridge: fix initial packet flood if !STP
If bridge is configured with no STP and forwarding delay of 0 (which
is typical for virtualization) then when link starts it will flood all
packets for the first 20 seconds.
This bug was introduced by a combination of earlier changes:
* forwarding database uses hold time of zero to indicate
user wants to always flood packets
* optimzation of the case of forwarding delay of 0 avoids the initial
timer tick
The fix is to just skip all the topology change detection code if
kernel STP is not being used.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_stp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index 6e63ec3f1fc..0660515f399 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -297,6 +297,9 @@ void br_topology_change_detection(struct net_bridge *br) { int isroot = br_is_root_bridge(br); + if (br->stp_enabled != BR_KERNEL_STP) + return; + pr_info("%s: topology change detected, %s\n", br->dev->name, isroot ? "propagating" : "sending tcn bpdu"); |