summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Healy <cphealy@gmail.com>2013-09-12 06:37:47 +0200
committerDavid S. Miller <davem@davemloft.net>2013-09-13 05:30:37 +0200
commit9a0620133ccce9dd35c00a96405c8d80938c2cc0 (patch)
tree26e00eef83cbd19294da234f10be2864b60b91a9
parentnet: tulip: remove deprecated IRQF_DISABLED (diff)
downloadlinux-9a0620133ccce9dd35c00a96405c8d80938c2cc0.tar.xz
linux-9a0620133ccce9dd35c00a96405c8d80938c2cc0.zip
resubmit bridge: fix message_age_timer calculation
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>
-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 1c0a50f13229..f1887ba7fc43 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -209,7 +209,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 */