summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-02-04 23:52:44 -0800
committerDavid S. Miller <davem@davemloft.net>2015-02-04 23:52:44 -0800
commit3fcf9011188755c883f377764c463b4271d594a2 (patch)
tree7f517307959ad99f4d3cb74797ef85798b195154 /net/bridge
parent06eb395fa9856b5a87cf7d80baee2a0ed3cdb9d7 (diff)
downloadlinux-3fcf9011188755c883f377764c463b4271d594a2.tar.bz2
Revert "bridge: Let bridge not age 'externally' learnt FDB entries, they are removed when 'external' entity notifies the aging"
This reverts commit 9a05dde59a35eee5643366d3d1e1f43fc9069adb. Requested by Scott Feldman. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_fdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 6eb94b58637a..08bf04bdac58 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -280,7 +280,7 @@ void br_fdb_cleanup(unsigned long _data)
hlist_for_each_entry_safe(f, n, &br->hash[i], hlist) {
unsigned long this_timer;
- if (f->is_static || f->added_by_external_learn)
+ if (f->is_static)
continue;
this_timer = f->updated + delay;
if (time_before_eq(this_timer, jiffies))