From patchwork Wed Sep 23 15:39:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 521746 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 08A381401AF for ; Thu, 24 Sep 2015 01:36:24 +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=NA+x22lD; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755771AbbIWPgR (ORCPT ); Wed, 23 Sep 2015 11:36:17 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:36224 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754624AbbIWPgN (ORCPT ); Wed, 23 Sep 2015 11:36:13 -0400 Received: by pacgz1 with SMTP id gz1so9434913pac.3 for ; Wed, 23 Sep 2015 08:36:13 -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=zA7byd0ccSqiudRJdezFHidVU64fIga6i2QZGktZavI=; b=NA+x22lDylKju9fle2FIXTZfJb2mJsdpiDg10PR9iHpskSe/LXtkr0pDYijmxrnNcQ LfgmyttXn4gxZXblfvx5f7xor+73lRuJcPD+3wuMeGr9wKbSrqZ1WOHJf2YtZUJhXqlQ p/UVxHPJ/dXAJv2PFI9a0FuGL4EixwlFqd7PY6U2qbwRJFUH30M0KJXd771HFuzxZPCH MtFI70VjkS+3PPvOja3QSAVB4aLdU0T8xUDHmbWZFzXOyVzQepCCtM52LRhcXD4eeB85 XM0TOp5yNFDDy3KS6f/euwBhnFN4Aatt+dUz+ePZm0G9xymw02v/5QN+S6A+YSqPkR0w uhIA== X-Received: by 10.68.163.5 with SMTP id ye5mr37591116pbb.120.1443022572991; Wed, 23 Sep 2015 08:36:12 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by smtp.gmail.com with ESMTPSA id rw8sm4245565pac.11.2015.09.23.08.36.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2015 08:36:12 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: davem@davemloft.net, 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 v3 4/7] rocker: adding port ageing_time for ageing out FDB entries Date: Wed, 23 Sep 2015 08:39:17 -0700 Message-Id: <1443022760-21301-5-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1443022760-21301-1-git-send-email-sfeldma@gmail.com> References: <1443022760-21301-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 Follow-up patcheset will allow user to change ageing_time, but for now just hard-code it to a fixed value (the same value used as the default for the bridge driver). Signed-off-by: Scott Feldman Acked-by: Jiri Pirko --- drivers/net/ethernet/rocker/rocker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index f55ed2c..be8bb04 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -221,6 +221,7 @@ struct rocker_port { __be16 internal_vlan_id; int stp_state; u32 brport_flags; + unsigned long ageing_time; bool ctrls[ROCKER_CTRL_MAX]; unsigned long vlan_bitmap[ROCKER_VLAN_BITMAP_LEN]; struct napi_struct napi_tx; @@ -4975,6 +4976,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) rocker_port->port_number = port_number; rocker_port->pport = port_number + 1; rocker_port->brport_flags = BR_LEARNING | BR_LEARNING_SYNC; + rocker_port->ageing_time = BR_DEFAULT_AGEING_TIME; INIT_LIST_HEAD(&rocker_port->trans_mem); rocker_port_dev_addr_init(rocker_port);