diff options
| author |   Roopa Prabhu <roopa@cumulusnetworks.com> | 2017-02-16 13:38:04 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-17 13:56:56 -0500 |
| commit | eda7a5e88d95d8cc4315451dcfb74064773cbc02 (patch) | |
| tree | 5d078517250388273f5ce3b8d91ac582f2858c49 | |
| parent | Merge branch 'bpf-misc' (diff) | |
| download | linux-dev-eda7a5e88d95d8cc4315451dcfb74064773cbc02.tar.xz linux-dev-eda7a5e88d95d8cc4315451dcfb74064773cbc02.zip | |
bridge: don't indicate expiry on NTF_EXT_LEARNED fdb entries
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>
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 4ac11574117c..4f598dc2d916 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); } |