提交 7ff46e79 编写于 作者: D 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: NDavid S. Miller <davem@davemloft.net>
上级 25cc8f07
......@@ -569,7 +569,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
fdb_notify(br, fdb, RTM_NEWNEIGH);
}
} else {
spin_lock_bh(&br->hash_lock);
spin_lock(&br->hash_lock);
if (likely(!fdb_find(head, addr, vid))) {
fdb = fdb_create(head, source, addr, vid);
if (fdb) {
......@@ -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
* it first, don't bother updating
*/
spin_unlock_bh(&br->hash_lock);
spin_unlock(&br->hash_lock);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册