From patchwork Thu Mar 1 18:12:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 144086 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 6B72D1007D5 for ; Fri, 2 Mar 2012 05:12:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755834Ab2CASM2 (ORCPT ); Thu, 1 Mar 2012 13:12:28 -0500 Received: from gw1.transmode.se ([195.58.98.146]:32892 "EHLO gw1.transmode.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755790Ab2CASM1 (ORCPT ); Thu, 1 Mar 2012 13:12:27 -0500 Received: from mail1.transmode.se (mail1.transmode.se [192.168.201.18]) by gw1.transmode.se (Postfix) with ESMTP id ED9052581E1 for ; Thu, 1 Mar 2012 19:12:24 +0100 (CET) Received: from gentoo-jocke.transmode.se ([172.20.4.10]) by mail1.transmode.se (Lotus Domino Release 8.5.3) with ESMTP id 2012030119122398-7361 ; Thu, 1 Mar 2012 19:12:23 +0100 Received: from gentoo-jocke.transmode.se (localhost [127.0.0.1]) by gentoo-jocke.transmode.se (8.14.4/8.14.0) with ESMTP id q21ICOir010291; Thu, 1 Mar 2012 19:12:24 +0100 Received: (from jocke@localhost) by gentoo-jocke.transmode.se (8.14.4/8.14.4/Submit) id q21ICNhc010289; Thu, 1 Mar 2012 19:12:24 +0100 From: Joakim Tjernlund To: netdev@vger.kernel.org Cc: Joakim Tjernlund Subject: [PATCH 1/2] bridge: Adjust min age inc for HZ > 256 Date: Thu, 1 Mar 2012 19:12:18 +0100 Message-Id: <1330625539-10247-1-git-send-email-Joakim.Tjernlund@transmode.se> X-Mailer: git-send-email 1.7.3.4 X-MIMETrack: Itemize by SMTP Server on mail1/Transmode(Release 8.5.3|September 15, 2011) at 01/03/2012 19:12:24, Serialize by Router on mail1/Transmode(Release 8.5.3|September 15, 2011) at 01/03/2012 19:12:24, Serialize complete at 01/03/2012 19:12:24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org min age increment needs to round up its min age tick for all HZ values to guarantee message age is increasing. Signed-off-by: Joakim Tjernlund --- The bridge list seems very slow so try netdev instead. net/bridge/br_stp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index a04eeb6..9a8aebd 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -17,9 +17,9 @@ #include "br_private_stp.h" /* since time values in bpdu are in jiffies and then scaled (1/256) - * before sending, make sure that is at least one. + * before sending, make sure that is at least one STP tick. */ -#define MESSAGE_AGE_INCR ((HZ < 256) ? 1 : (HZ/256)) +#define MESSAGE_AGE_INCR ((HZ / 256) + 1) static const char *const br_port_state_names[] = { [BR_STATE_DISABLED] = "disabled",