summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorChris Healy <cphealy@gmail.com>2013-09-11 21:37:47 -0700
committerBen Hutchings <ben@decadent.org.uk>2013-10-26 21:06:08 +0100
commit669c81001fd0bd914fb2a1c15ddbb427de8a8373 (patch)
treef9a7ecfec0c33de1a394ff41d69d8090853afcd8 /net
parentaf7e0f4a91ca9049ee9e541f8a98e762a12e9b9b (diff)
resubmit bridge: fix message_age_timer calculation
[ Upstream commit 9a0620133ccce9dd35c00a96405c8d80938c2cc0 ] This changes the message_age_timer calculation to use the BPDU's max age as opposed to the local bridge's max age. This is in accordance with section 8.6.2.3.2 Step 2 of the 802.1D-1998 sprecification. With the current implementation, when running with very large bridge diameters, convergance will not always occur even if a root bridge is configured to have a longer max age. Tested successfully on bridge diameters of ~200. Signed-off-by: Chris Healy <cphealy@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_stp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index dd147d78a588..8ac946f32f9a 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -189,7 +189,7 @@ static void br_record_config_information(struct net_bridge_port *p,
p->designated_age = jiffies + bpdu->message_age;
mod_timer(&p->message_age_timer, jiffies
- + (p->br->max_age - bpdu->message_age));
+ + (bpdu->max_age - bpdu->message_age));
}
/* called under bridge lock */