diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-07 19:43:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-07 19:43:47 -0700 |
| commit | 7ff46e79fb7df5b09c46c36857929fdf039f8b31 (patch) | |
| tree | b3f1218a38c505df24e7d1f49645c8d8fbaf8ad5 /net | |
| parent | 25cc8f0763c972911b1a65099cd10d9f8a45a7b0 (diff) | |
| download | blackbird-op-linux-7ff46e79fb7df5b09c46c36857929fdf039f8b31.tar.gz blackbird-op-linux-7ff46e79fb7df5b09c46c36857929fdf039f8b31.zip | |
Revert "bridge: use _bh spinlock variant for br_fdb_update to avoid lockup"
This reverts commit 1d7c49037b12016e7056b9f2c990380e2187e766.
Nikolay Aleksandrov has a better version of this fix.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_fdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 7eacc8ae9779..e0670d7054f9 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -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); } } |
