From: David S. Miller <davem@davemloft.net>
Date: Thu, 5 Feb 2015 07:52:44 +0000 (-0800)
Subject: Revert "bridge: Let bridge not age 'externally' learnt FDB entries, they are removed... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3fcf9011188755c883f377764c463b4271d594a2;p=linux-beck.git

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>
---

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))