Return-Path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=cNnLE2bQGjsukDkpSVG1mnKnKwACz+Ctfod225dDy34=; b=VVEvmtilpLUESqzuj1jMaMchSZXgofjBIELJJDnoPDnQV/yTe7RJDjlk6/eXVfP9Ws 5QkOd+BYEZw1sFXd8zBxpoHTqwYPHXQmEuBtND8vOHhUx1mMyeHjcNzjqHyIrb7VvvVH yN0jQR3hnpjz4Wl8JyOwQV10dTyRAZKugdS3UOcHVv56WBAddP96/LiHcb2fuqjp10lv mElv/7qO1LKtHVZcxZlQ31lkQNQk6JSivzcAk7A7tWskUO4krRaARYlOlJ0uOD1Scqds QwZ0lC+NXaRB5wGu8mL7R2Q56L1SJLuLNGpbIgVTv1cKFnZCwFzSin99LLt9bKr3OtUc +5cg== From: Chris Healy Date: Wed, 11 Sep 2013 21:37:47 -0700 Message-Id: <1378960667-5092-1-git-send-email-cphealy@gmail.com> Subject: [Bridge] [PATCH 1/1] resubmit bridge: fix message_age_timer calculation List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stephen Hemminger , "David S. Miller" Cc: netdev@vger.kernel.org, bridge@lists.linux-foundation.org, buytenh@wantstofly.org 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 */ -- 1.8.1.2