From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Date: Fri, 1 Nov 2019 14:46:39 +0200
Subject: net: bridge: fdb: restore unlikely() when taking over externally
added entries
Patch-mainline: v5.5-rc1
Git-commit: 58ec1ea637ca2230c69d6972985ba619366c688b
References: bsc#1154353
Taking over hw-learned entries is not a likely scenario so restore the
unlikely() use for the case of SW taking over externally learned
entries.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
net/bridge/br_fdb.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -587,8 +587,10 @@ void br_fdb_update(struct net_bridge *br
fdb->dst = source;
fdb_modified = true;
/* Take over HW learned entry */
- test_and_clear_bit(BR_FDB_ADDED_BY_EXT_LEARN,
- &fdb->flags);
+ if (unlikely(test_bit(BR_FDB_ADDED_BY_EXT_LEARN,
+ &fdb->flags)))
+ clear_bit(BR_FDB_ADDED_BY_EXT_LEARN,
+ &fdb->flags);
}
if (now != fdb->updated)
fdb->updated = now;