summaryrefslogtreecommitdiff
path: root/net/bridge/br_private.h
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2011-07-22 07:47:06 +0000
committerDavid S. Miller <davem@davemloft.net>2011-07-22 17:01:12 -0700
commit0c03150e7ea8f7fcd03cfef29385e0010b22ee92 (patch)
tree60dae3c582863b79df992a605c18a0029469b67b /net/bridge/br_private.h
parent781223a15c510b4cb11328603bfc41ec8352f015 (diff)
downloadlinux-3.10-0c03150e7ea8f7fcd03cfef29385e0010b22ee92.tar.gz
linux-3.10-0c03150e7ea8f7fcd03cfef29385e0010b22ee92.tar.bz2
linux-3.10-0c03150e7ea8f7fcd03cfef29385e0010b22ee92.zip
bridge: send proper message_age in config BPDU
A bridge topology with three systems: +------+ +------+ | A(2) |--| B(1) | +------+ +------+ \ / +------+ | C(3) | +------+ What is supposed to happen: * bridge with the lowest ID is elected root (for example: B) * C detects that A->C is higher cost path and puts in blocking state What happens. Bridge with lowest id (B) is elected correctly as root and things start out fine initially. But then config BPDU doesn't get transmitted from A -> C. Because of that the link from A-C is transistioned to the forwarding state. The root cause of this is that the configuration messages is generated with bogus message age, and dropped before sending. In the standardmessage_age is supposed to be: the time since the generation of the Configuration BPDU by the Root that instigated the generation of this Configuration BPDU. Reimplement this by recording the timestamp (age + jiffies) when recording config information. The old code incorrectly used the time elapsed on the ageing timer which was incorrect. See also: https://bugzilla.vyatta.com/show_bug.cgi?id=7164 Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r--net/bridge/br_private.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 54578f274d8..78cc364997d 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -124,6 +124,7 @@ struct net_bridge_port
bridge_id designated_bridge;
u32 path_cost;
u32 designated_cost;
+ unsigned long designated_age;
struct timer_list forward_delay_timer;
struct timer_list hold_timer;