From patchwork Thu Sep 12 04:37:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Healy X-Patchwork-Id: 274426 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AF39D2C0211 for ; Thu, 12 Sep 2013 14:38:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754656Ab3ILEh4 (ORCPT ); Thu, 12 Sep 2013 00:37:56 -0400 Received: from mail-oa0-f41.google.com ([209.85.219.41]:64849 "EHLO mail-oa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752592Ab3ILEh4 (ORCPT ); Thu, 12 Sep 2013 00:37:56 -0400 Received: by mail-oa0-f41.google.com with SMTP id j6so10382288oag.28 for ; Wed, 11 Sep 2013 21:37:55 -0700 (PDT) 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== X-Received: by 10.182.80.196 with SMTP id t4mr4848556obx.1.1378960674478; Wed, 11 Sep 2013 21:37:54 -0700 (PDT) Received: from cphealy-desktop.gateway.2wire.net (99-73-211-50.lightspeed.irvnca.sbcglobal.net. [99.73.211.50]) by mx.google.com with ESMTPSA id bq4sm2733115obb.1.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Sep 2013 21:37:54 -0700 (PDT) From: Chris Healy To: Stephen Hemminger , "David S. Miller" Cc: bridge@lists.linux-foundation.org, netdev@vger.kernel.org, buytenh@wantstofly.org, Chris Healy Subject: [PATCH 1/1] resubmit bridge: fix message_age_timer calculation Date: Wed, 11 Sep 2013 21:37:47 -0700 Message-Id: <1378960667-5092-1-git-send-email-cphealy@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.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 */