aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChris Healy <cphealy@gmail.com>2013-09-11 21:37:47 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-13 14:51:07 -0700
commitae9f7cfdfc708c1c323e7e02e3ba067ddc96b671 (patch)
tree1469e769be0e94b2f5e5c900ee8712e1f29dff26 /net
parent956c741a9eef6a4e7a6755062d4afc1e686a1c5d (diff)
downloadkernel_samsung_smdk4412-ae9f7cfdfc708c1c323e7e02e3ba067ddc96b671.tar.gz
kernel_samsung_smdk4412-ae9f7cfdfc708c1c323e7e02e3ba067ddc96b671.tar.bz2
kernel_samsung_smdk4412-ae9f7cfdfc708c1c323e7e02e3ba067ddc96b671.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 fcff6225154..1b55122c0dc 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -191,7 +191,7 @@ static inline 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 */