diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-01-16 04:35:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-17 10:17:32 -0500 |
| commit | 27a429383b399fc0f68bea55c422d7179f3c8b05 (patch) | |
| tree | a38d2d38a7506e10cf4bd00a2b49273d82878fbf /net | |
| parent | 319d3b9c97b5e3191e419bb95496bf08ec50f096 (diff) | |
| download | linux-3.10-27a429383b399fc0f68bea55c422d7179f3c8b05.tar.gz linux-3.10-27a429383b399fc0f68bea55c422d7179f3c8b05.tar.bz2 linux-3.10-27a429383b399fc0f68bea55c422d7179f3c8b05.zip | |
bridge: BH already disabled in br_fdb_cleanup()
br_fdb_cleanup() is run from timer interrupt, BH already masked.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Stephen Hemminger <shemminger@vyatta.com>
CC: Štefan Gula <steweg@gmail.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
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 f963f6b1884..5ba0c844d50 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -146,7 +146,7 @@ void br_fdb_cleanup(unsigned long _data) unsigned long next_timer = jiffies + br->ageing_time; int i; - spin_lock_bh(&br->hash_lock); + spin_lock(&br->hash_lock); for (i = 0; i < BR_HASH_SIZE; i++) { struct net_bridge_fdb_entry *f; struct hlist_node *h, *n; @@ -162,7 +162,7 @@ void br_fdb_cleanup(unsigned long _data) next_timer = this_timer; } } - spin_unlock_bh(&br->hash_lock); + spin_unlock(&br->hash_lock); mod_timer(&br->gc_timer, round_jiffies_up(next_timer)); } |