From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 10 Sep 2013 11:41:52 -0700 From: Stephen Hemminger Message-ID: <20130910114152.40b28ef3@nehalam.linuxnetplumber.net> In-Reply-To: <1378745768-4495-1-git-send-email-cphealy@gmail.com> References: <1378745768-4495-1-git-send-email-cphealy@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Bridge] [PATCH 1/1] bridge: fix message_age_timer calculation List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Chris Healy Cc: netdev@vger.kernel.org, bridge@lists.linux-foundation.org, "David S. Miller" , buytenh@wantstofly.org On Mon, 9 Sep 2013 09:56:08 -0700 Chris Healy wrote: > 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 > --- > net/bridge/br_stp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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 makes sense. Acked-by: Stephen Hemminger