diff options
| author | Chris Healy <cphealy@gmail.com> | 2013-09-11 21:37:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 15:42:47 -0700 |
| commit | 12021622d44d200b0b7582bb7b9d31c2c36a9852 (patch) | |
| tree | 40a1033d82bc3c58f2099b170a1afb34dd4d0bf9 /net | |
| parent | 9dea496eb4b44b347fcf3667e98c70784b07fceb (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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_stp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index 8c836d96ba76..09c61ac36597 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 */ |