Skip to content

Commit

Permalink
bridge: BH already disabled in br_fdb_cleanup()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Jan 17, 2012
1 parent 319d3b9 commit 27a4293
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/bridge/br_fdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
}
Expand Down

0 comments on commit 27a4293

Please sign in to comment.