---

yaml --- r: 286180 b: refs/heads/master c: 27a4293 h: refs/heads/master v: v3
git-mirror · Jan 17, 2012 · baec12e · baec12e
1 parent 412e78b
commit baec12e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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));
 }