From patchwork Fri Sep 18 19:55:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 519564 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 01179140787 for ; Sat, 19 Sep 2015 05:53:23 +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=rpYC7VDM; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754051AbbIRTxQ (ORCPT ); Fri, 18 Sep 2015 15:53:16 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33053 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754010AbbIRTxN (ORCPT ); Fri, 18 Sep 2015 15:53:13 -0400 Received: by pacex6 with SMTP id ex6so59217137pac.0 for ; Fri, 18 Sep 2015 12:53: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=cCymHIeEH0YF/IaCfLfGfn4FUfqh7MAWxjWIPOU6kTI=; b=rpYC7VDMObD2WI22xTMNirsGXOasbBcnClInNTTkxvTNsiqDIMSiyPXIkoGkKBnvu/ ssG15nIMkCf2I+SJmxvu1YUBZ5u5SC9XxUHZPubgeMJ2eqNyvj6/atCnkIPbz2qg/0WN jgJvEz7koUUz1vLsQHW0GLVQqtQjYMszRuDFe/yLJLBnJMgzy6+LxG6yXhl65QbSXhgo oZSquzwQF8OYeDmNVaN+8WsqBAjiQ28qm14ofSLq6tbKep0thD8n3CoUbtWQjCcm3tEV 7bWWNBPKUcYzFX4qg5cC7uT9e0mXnJfflz3opUP+ZlTHV9ffG1KYJaWV0mnVj4+V72BU nq8Q== X-Received: by 10.68.196.233 with SMTP id ip9mr8966537pbc.139.1442605993292; Fri, 18 Sep 2015 12:53:13 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by smtp.gmail.com with ESMTPSA id fx4sm10458910pbb.92.2015.09.18.12.53.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Sep 2015 12:53:12 -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 6/7] bridge: don't age externally added FDB entries Date: Fri, 18 Sep 2015 12:55:50 -0700 Message-Id: <1442606151-50429-7-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1442606151-50429-1-git-send-email-sfeldma@gmail.com> References: <1442606151-50429-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: Siva Mannem Signed-off-by: Siva Mannem Signed-off-by: Scott Feldman Acked-by: Vivien Didelot Acked-by: Jiri Pirko Acked-by: Premkumar Jonnala --- net/bridge/br_fdb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 9e9875d..6663cc0 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -299,6 +299,8 @@ void br_fdb_cleanup(unsigned long _data) unsigned long this_timer; if (f->is_static) continue; + if (f->added_by_external_learn) + continue; this_timer = f->updated + delay; if (time_before_eq(this_timer, jiffies)) fdb_delete(br, f);