Commit 58ec1ea6 authored Nov 01, 2019 by Nikolay Aleksandrov Committed by David S. Miller Nov 01, 2019

net: bridge: fdb: restore unlikely() when taking over externally added entries



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>

parent 31f1155b

net/bridge/br_fdb.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -587,7 +587,9 @@ void br_fdb_update(struct net_bridge br, struct net_bridge_port source,
		fdb->dst = source;
		fdb_modified = true;
		/* Take over HW learned entry */
		test_and_clear_bit(BR_FDB_ADDED_BY_EXT_LEARN,
		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)

Admin message