lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bridge: BH already disabled in br_fdb_cleanup()

Browse Source 
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>
This commit is contained in:
Eric Dumazet
2012-01-16 04:35:50 +00:00
committed by David S. Miller
parent 319d3b9c97
commit 27a429383b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/bridge/br_fdb.c
View File

@@ -146,7 +146,7 @@ void br_fdb_cleanup(unsigned long _data)
unsigned long next_timer = jiffies + br->ageing_time; unsigned long next_timer = jiffies + br->ageing_time;
int i; int i;
spin_lock_bh(&br->hash_lock); spin_lock(&br->hash_lock);
for (i = 0; i < BR_HASH_SIZE; i++) { for (i = 0; i < BR_HASH_SIZE; i++) {
struct net_bridge_fdb_entry *f; struct net_bridge_fdb_entry *f;
struct hlist_node *h, *n; struct hlist_node *h, *n;
@@ -162,7 +162,7 @@ void br_fdb_cleanup(unsigned long _data)
next_timer = this_timer; 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)); mod_timer(&br->gc_timer, round_jiffies_up(next_timer));
} }