From patchwork Sun Sep 20 15:48:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 519998 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 019901402A9 for ; Mon, 21 Sep 2015 01:45:59 +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=aSEnSxKG; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753972AbbITPpy (ORCPT ); Sun, 20 Sep 2015 11:45:54 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:35816 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753558AbbITPpr (ORCPT ); Sun, 20 Sep 2015 11:45:47 -0400 Received: by pacfv12 with SMTP id fv12so95508225pac.2 for ; Sun, 20 Sep 2015 08:45:46 -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=aSEnSxKGn+eCM2MFrTTabPYV68rpQIqTLNAfuUHLki0voYUl2DbptPWTcEh8gtlDqH ogpD3uqkgPcGrQvjuIOgFjtNKwLJCgCaSQwPY/VNH3jG2TVks766uW1d+velysvnmJ74 Wr7m8fvN7T6XsFT6wiLirqzlIdWPU5goF5FJ6d2K4Fhz/ieTcUhb1DqzIqRWAUwWJ8su gpBvZ5maaw5YaDIkMrirJoYdS8n6s66qHHrgva5H9xZZfVBQQkWv6ZZU9mh7zu3RY/xV EcFHHztlbZay+VX2wXMToG66btlSNcZTTnOdUJoWC/Fdc7BmKNVEQsUJzT3r1gXIlgUD XhuQ== X-Received: by 10.68.178.36 with SMTP id cv4mr19094605pbc.161.1442763946865; Sun, 20 Sep 2015 08:45:46 -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.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Sep 2015 08:45:46 -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 4/7] rocker: adding port ageing_time for ageing out FDB entries Date: Sun, 20 Sep 2015 08:48:26 -0700 Message-Id: <1442764109-11110-5-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 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);