From patchwork Sun Sep 20 15:48:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 520001 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 4212E140271 for ; Mon, 21 Sep 2015 01:46:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=TbPvmxjB; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753886AbbITPpx (ORCPT ); Sun, 20 Sep 2015 11:45:53 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33246 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753198AbbITPpp (ORCPT ); Sun, 20 Sep 2015 11:45:45 -0400 Received: by pacex6 with SMTP id ex6so93761679pac.0 for ; Sun, 20 Sep 2015 08:45:45 -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:in-reply-to:references; bh=00TGqoGEub5sBgHEi81xHjT1Gr7urH4DyaSvcRzdWFk=; b=TbPvmxjBaQsbK6sxyAzSiJZ8977M4ZyVplGtjzN8VfUMPm8/lUKiik3ldKG3amY767 TdpQvt7bHTTZgs0cxrbrrLDGpOK3u3e5ncP+x9rS7AtZ+Zq1ZM2/+N9CTgiWYI3Ndqzy k9Cxlj4kG4Wuw7TliuXSuflSTjwjIJ16r2ysmMYo78omNS3IMCaYPZlE2y5VIoiVHfDh huDp4fdzU/sCCi4qiZnZYxUHjVqL/5dw4GFYTfz9ji8nigTk2TIn+tKlLUUKC0qbnbH7 MCwoO7Qk1N18MSiBPjCpCvwGatW1tn+EDR7nqzdavw9I2nW/zRYd7NHEaPMQq/q+1km9 uFVg== X-Received: by 10.66.252.35 with SMTP id zp3mr19017411pac.43.1442763945335; Sun, 20 Sep 2015 08:45:45 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by smtp.gmail.com with ESMTPSA id py6sm19552873pbb.62.2015.09.20.08.45.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Sep 2015 08:45:44 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, siva.mannem.lnx@gmail.com, pjonnala@broadcom.com, stephen@networkplumber.org, roopa@cumulusnetworks.com, andrew@lunn.ch, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com Subject: [PATCH net-next v2 3/7] bridge: define some min/max/default ageing time constants Date: Sun, 20 Sep 2015 08:48:25 -0700 Message-Id: <1442764109-11110-4-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1442764109-11110-1-git-send-email-sfeldma@gmail.com> References: <1442764109-11110-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman Signed-off-by: Scott Feldman Acked-by: Jiri Pirko --- v2: Per Jiri review comment: add BR_DEFAULT_AGEING_TIME to defines include/linux/if_bridge.h | 6 ++++++ net/bridge/br_device.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index dad8b00..a338a68 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -46,6 +46,12 @@ struct br_ip_list { #define BR_LEARNING_SYNC BIT(9) #define BR_PROXYARP_WIFI BIT(10) +/* values as per ieee8021QBridgeFdbAgingTime */ +#define BR_MIN_AGEING_TIME (10 * HZ) +#define BR_MAX_AGEING_TIME (1000000 * HZ) + +#define BR_DEFAULT_AGEING_TIME (300 * HZ) + extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); typedef int br_should_route_hook_t(struct sk_buff *skb); diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 6ed2feb..2f81624 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -391,7 +391,7 @@ void br_dev_setup(struct net_device *dev) br->bridge_max_age = br->max_age = 20 * HZ; br->bridge_hello_time = br->hello_time = 2 * HZ; br->bridge_forward_delay = br->forward_delay = 15 * HZ; - br->ageing_time = 300 * HZ; + br->ageing_time = BR_DEFAULT_AGEING_TIME; br_netfilter_rtable_init(br); br_stp_timer_init(br);