| From 7f67ff4444313ee18c4497d00478d12fc4d045be Mon Sep 17 00:00:00 2001 |
| From: Chris Healy <cphealy@gmail.com> |
| Date: Wed, 11 Sep 2013 21:37:47 -0700 |
| Subject: resubmit bridge: fix message_age_timer calculation |
| |
| From: Chris Healy <cphealy@gmail.com> |
| |
| [ 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> |
| --- |
| net/bridge/br_stp.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/bridge/br_stp.c |
| +++ b/net/bridge/br_stp.c |
| @@ -209,7 +209,7 @@ static void br_record_config_information |
| 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 */ |
