[PATCH net-next] bridge: don't indicate expiry on NTF_EXT_LEARNED fdb entries

From: Roopa Prabhu <redacted>

added_by_external_learn fdb entries are added and expired by
external entities like switchdev driver or external controllers.
ageing is already disabled for such entries. Hence, don't
indicate expiry for such fdb entries.

CC: Nikolay Aleksandrov <redacted>
CC: Jiri Pirko <jiri@resnulli.us>
CC: Ido Schimmel <redacted>
Signed-off-by: Roopa Prabhu <redacted>
---
 net/bridge/br_fdb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 4ac1157..4f598dc 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c

@@ -65,7 +65,7 @@ static inline unsigned long hold_time(const struct net_bridge *br)
 static inline int has_expired(const struct net_bridge *br,
 				  const struct net_bridge_fdb_entry *fdb)
 {
-	return !fdb->is_static &&
+	return !fdb->is_static && !fdb->added_by_external_learn &&
 		time_before_eq(fdb->updated + hold_time(br), jiffies);
 }
 

-- 
1.7.10.4

On Thu, Feb 16, 2017 at 01:38:04PM -0800, Roopa Prabhu wrote:

From: Roopa Prabhu <redacted>

added_by_external_learn fdb entries are added and expired by
external entities like switchdev driver or external controllers.
ageing is already disabled for such entries. Hence, don't
indicate expiry for such fdb entries.

CC: Nikolay Aleksandrov <redacted>
CC: Jiri Pirko <jiri@resnulli.us>
CC: Ido Schimmel <redacted>
Signed-off-by: Roopa Prabhu <redacted>

Reviewed-by: Ido Schimmel <redacted>
Tested-by: Ido Schimmel <redacted>

Thanks!

On 16/02/17 22:38, Roopa Prabhu wrote:

Good catch,

Reviewed-by: Nikolay Aleksandrov <redacted>

From: Roopa Prabhu <redacted>
Date: Thu, 16 Feb 2017 13:38:04 -0800

From: Roopa Prabhu <redacted>

added_by_external_learn fdb entries are added and expired by
external entities like switchdev driver or external controllers.
ageing is already disabled for such entries. Hence, don't
indicate expiry for such fdb entries.

CC: Nikolay Aleksandrov <redacted>
CC: Jiri Pirko <jiri@resnulli.us>
CC: Ido Schimmel <redacted>
Signed-off-by: Roopa Prabhu <redacted>

Applied.