releases/3.10.16/resubmit-bridge-fix-message_age_timer-calculation.patch

   1 From fd5188f3905894b2e9ba20e1c654ec53442a514e Mon Sep 17 00:00:00 2001
   2 From: Chris Healy <cphealy@gmail.com>
   3 Date: Wed, 11 Sep 2013 21:37:47 -0700
   4 Subject: resubmit bridge: fix message_age_timer calculation
   5
   6 From: Chris Healy <cphealy@gmail.com>
   7
   8 [ Upstream commit 9a0620133ccce9dd35c00a96405c8d80938c2cc0 ]
   9
  10 This changes the message_age_timer calculation to use the BPDU's max age as
  11 opposed to the local bridge's max age.  This is in accordance with section
  12 8.6.2.3.2 Step 2 of the 802.1D-1998 sprecification.
  13
  14 With the current implementation, when running with very large bridge
  15 diameters, convergance will not always occur even if a root bridge is
  16 configured to have a longer max age.
  17
  18 Tested successfully on bridge diameters of ~200.
  19
  20 Signed-off-by: Chris Healy <cphealy@gmail.com>
  21 Signed-off-by: David S. Miller <davem@davemloft.net>
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23 ---
  24  net/bridge/br_stp.c |    2 +-
  25  1 file changed, 1 insertion(+), 1 deletion(-)
  26
  27 --- a/net/bridge/br_stp.c
  28 +++ b/net/bridge/br_stp.c
  29 @@ -209,7 +209,7 @@ static void br_record_config_information
  30         p->designated_age = jiffies - bpdu->message_age;
  31
  32         mod_timer(&p->message_age_timer, jiffies
  33 -                 + (p->br->max_age - bpdu->message_age));
  34 +                 + (bpdu->max_age - bpdu->message_age));
  35  }
  36
  37  /* called under bridge lock */