Message ID | 1378960667-5092-1-git-send-email-cphealy@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Chris Healy <cphealy@gmail.com> Date: Wed, 11 Sep 2013 21:37:47 -0700 > 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> Applied and queued up for -stable, thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index 1c0a50f..f1887ba 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -209,7 +209,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 */
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> --- net/bridge/br_stp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)