From patchwork Wed Sep 23 15:39:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 521745 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 693C51401DE for ; Thu, 24 Sep 2015 01:36: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=Cm+ZUj85; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755781AbbIWPgS (ORCPT ); Wed, 23 Sep 2015 11:36:18 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:33593 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755629AbbIWPgQ (ORCPT ); Wed, 23 Sep 2015 11:36:16 -0400 Received: by pacex6 with SMTP id ex6so43639743pac.0 for ; Wed, 23 Sep 2015 08:36:15 -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=KiTxR20l4YAZqXRwDLRjqU2EsNc8zvjXtmJ/Vyy14Uk=; b=Cm+ZUj85zdoDCayqjRS6FkAbKVDChPnbNBg5FumpbyNAf+ndW2RE1fDlLRDR89kdfq 14ub2e46dH8BTEZdSJWP3PYmJqwL+Q+82d8zKAcn7nji3VGaBMn7V+s6FPaOCIGg/tGH UFcl9x8rWDUHk8U/4wkfi3PRjD5KohGbt39A+ITmOY2tvZcpQOBiGpAWH8asQ9cCXdy0 VkC+Sh15xRJB8i0rUB0unL7XFxv6alDFjVfUsXqTq97sx6o+GpxpQIvh/eiQzC0Jc2uZ CPyOvwCYyJ0/gkf5E+cbBXMMh1d28A4KpRY84YoAs2aXbII8H1DvQpwNmtl49eN2+jZy ChxA== X-Received: by 10.68.202.9 with SMTP id ke9mr38487567pbc.85.1443022575772; Wed, 23 Sep 2015 08:36:15 -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.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2015 08:36:15 -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 6/7] bridge: don't age externally added FDB entries Date: Wed, 23 Sep 2015 08:39:19 -0700 Message-Id: <1443022760-21301-7-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: 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);