From baec12eb42d4aaf0ef5b2a1159badabcb01adc0c Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 16 Jan 2012 04:35:50 +0000 Subject: [PATCH] --- yaml --- r: 286180 b: refs/heads/master c: 27a429383b399fc0f68bea55c422d7179f3c8b05 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_fdb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ddbc752906f5..66b05eb7446f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 319d3b9c97b5e3191e419bb95496bf08ec50f096 +refs/heads/master: 27a429383b399fc0f68bea55c422d7179f3c8b05 diff --git a/trunk/net/bridge/br_fdb.c b/trunk/net/bridge/br_fdb.c index f963f6b1884f..5ba0c844d508 100644 --- a/trunk/net/bridge/br_fdb.c +++ b/trunk/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)); }