summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Mannem <siva.mannem.lnx@gmail.com>2015-09-23 08:39:19 -0700
committerDavid S. Miller <davem@davemloft.net>2015-09-23 14:35:58 -0700
commitdcd45e06496ca586db35949d1d92d48aab8a0a00 (patch)
treef8967d36fee43636ea84ffd4851ddf985363f09b
parent52fe3e2d51d27c0e68b2bea29dea0b64af2c665e (diff)
downloadlinux-dcd45e06496ca586db35949d1d92d48aab8a0a00.tar.bz2
bridge: don't age externally added FDB entries
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bridge/br_fdb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 9e9875da0a4f..6663cc0789a6 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);