resubmit bridge: fix message_age_timer calculation
authorChris Healy <cphealy@gmail.com>
Thu, 12 Sep 2013 04:37:47 +0000 (21:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Oct 2013 22:42:47 +0000 (15:42 -0700)
commit12021622d44d200b0b7582bb7b9d31c2c36a9852
tree40a1033d82bc3c58f2099b170a1afb34dd4d0bf9
parent9dea496eb4b44b347fcf3667e98c70784b07fceb
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>
net/bridge/br_stp.c