netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <1443022760-21301-7-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1443022760-21301-1-git-send-email-sfeldma@gmail.com>

From: Siva Mannem <siva.mannem.lnx@gmail.com>

Signed-off-by: Siva Mannem <siva.mannem.lnx@gmail.com>
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Premkumar Jonnala <pjonnala@broadcom.com>
---
 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);
-- 
1.7.10.4

  parent reply	other threads:[~2015-09-23 15:36 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-23 15:39 [PATCH net-next v3 0/7] bridge: don't age out externally added FDB entries sfeldma
2015-09-23 15:39 ` [PATCH net-next v3 1/7] rocker: track when FDB entry is touched sfeldma
2015-09-23 15:39 ` [PATCH net-next v3 2/7] rocker: store rocker_port in fdb key rather than pport sfeldma
2015-09-23 15:39 ` [PATCH net-next v3 3/7] bridge: define some min/max/default ageing time constants sfeldma
2015-09-23 15:49   ` Jiri Pirko
2015-09-23 15:39 ` [PATCH net-next v3 4/7] rocker: adding port ageing_time for ageing out FDB entries sfeldma
2015-09-23 15:49   ` Jiri Pirko
2015-09-23 15:39 ` [PATCH net-next v3 5/7] rocker: add FDB cleanup timer sfeldma
2015-09-23 15:39 ` sfeldma [this message]
2015-09-23 15:39 ` [PATCH net-next v3 7/7] switchdev: update documentation on FDB ageing_time sfeldma
2015-09-23 21:36 ` [PATCH net-next v3 0/7] bridge: don't age out externally added FDB entries David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1443022760-21301-7-git-send-email-sfeldma@gmail.com \
    --to=sfeldma@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=jiri@resnulli.us \
    --cc=netdev@vger.kernel.org \
    --cc=pjonnala@broadcom.com \
    --cc=roopa@cumulusnetworks.com \
    --cc=siva.mannem.lnx@gmail.com \
    --cc=stephen@networkplumber.org \
    --cc=vivien.didelot@savoirfairelinux.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).