Commit 7ff46e79 authored by David S. Miller's avatar David S. Miller

Revert "bridge: use _bh spinlock variant for br_fdb_update to avoid lockup"

This reverts commit 1d7c4903.

Nikolay Aleksandrov has a better version of this fix.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25cc8f07
...@@ -569,7 +569,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, ...@@ -569,7 +569,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
fdb_notify(br, fdb, RTM_NEWNEIGH); fdb_notify(br, fdb, RTM_NEWNEIGH);
} }
} else { } else {
spin_lock_bh(&br->hash_lock); spin_lock(&br->hash_lock);
if (likely(!fdb_find(head, addr, vid))) { if (likely(!fdb_find(head, addr, vid))) {
fdb = fdb_create(head, source, addr, vid); fdb = fdb_create(head, source, addr, vid);
if (fdb) { if (fdb) {
...@@ -581,7 +581,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, ...@@ -581,7 +581,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
/* else we lose race and someone else inserts /* else we lose race and someone else inserts
* it first, don't bother updating * it first, don't bother updating
*/ */
spin_unlock_bh(&br->hash_lock); spin_unlock(&br->hash_lock);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment