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

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

[Roopa Prabhu]

From: Roopa Prabhu <roopa@cumulusnetworks.com>

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 <nikolay@cumulusnetworks.com>
CC: Jiri Pirko <jiri@resnulli.us>
CC: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
 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

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

[Ido Schimmel]

On Thu, Feb 16, 2017 at 01:38:04PM -0800, Roopa Prabhu wrote:
> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> 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 <nikolay@cumulusnetworks.com>
> CC: Jiri Pirko <jiri@resnulli.us>
> CC: Ido Schimmel <idosch@mellanox.com>
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Tested-by: Ido Schimmel <idosch@mellanox.com>

Thanks!

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

[Nikolay Aleksandrov]

On 16/02/17 22:38, Roopa Prabhu wrote:
> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> 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 <nikolay@cumulusnetworks.com>
> CC: Jiri Pirko <jiri@resnulli.us>
> CC: Ido Schimmel <idosch@mellanox.com>
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
> ---
>  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);
>  }
>  
> 

Good catch,

Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

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

[David Miller]

From: Roopa Prabhu <roopa@cumulusnetworks.com>
Date: Thu, 16 Feb 2017 13:38:04 -0800

> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> 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 <nikolay@cumulusnetworks.com>
> CC: Jiri Pirko <jiri@resnulli.us>
> CC: Ido Schimmel <idosch@mellanox.com>
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

Applied.