diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2017-02-13 14:59:09 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-14 12:41:02 -0500 |
| commit | bfd0aeac52f74bfb44c0974131e44abb33a13e78 (patch) | |
| tree | 674273a1c6b5c793891030060abf6bc836e6de62 /net/bridge/br_device.c | |
| parent | net:dsa:mv88e6xxx: use watchdog ops for 6097 chip (diff) | |
| download | linux-dev-bfd0aeac52f74bfb44c0974131e44abb33a13e78.tar.xz linux-dev-bfd0aeac52f74bfb44c0974131e44abb33a13e78.zip | |
bridge: fdb: converge fdb searching functions into one
Before this patch we had 3 different fdb searching functions which was
confusing. This patch reduces all of them to one - fdb_find_rcu(), and
two flavors: br_fdb_find() which requires hash_lock and br_fdb_find_rcu
which requires RCU. This makes it clear what needs to be used, we also
remove two abusers of __br_fdb_get which called it under hash_lock and
replace them with br_fdb_find().
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/bridge/br_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index d208ee9ab60a..ea71513fca21 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -79,7 +79,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) br_multicast_flood(mdst, skb, false, true); else br_flood(br, skb, BR_PKT_MULTICAST, false, true); - } else if ((dst = __br_fdb_get(br, dest, vid)) != NULL) { + } else if ((dst = br_fdb_find_rcu(br, dest, vid)) != NULL) { br_forward(dst->dst, skb, false, true); } else { br_flood(br, skb, BR_PKT_UNICAST, false, true); |