---

yaml --- r: 20335 b: refs/heads/master c: 78872cc h: refs/heads/master i: 20333: 87eec33 20331: 28c47ae 20327: a8b1bf4 20319: 8571eec v: v3
git-mirror · Feb 15, 2006 · 4b17c9d · 4b17c9d
1 parent a68698d
commit 4b17c9d
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: ee68cea2c26b7a8222f9020f54d22c6067011e8b
+refs/heads/master: 78872ccb68335b14f0d1ac7338ecfcbf1cba1df4
diff --git a/trunk/net/bridge/br_stp_if.c b/trunk/net/bridge/br_stp_if.c
@@ -67,7 +67,7 @@ void br_stp_disable_bridge(struct net_bridge *br)
 {
 	struct net_bridge_port *p;
 
-	spin_lock(&br->lock);
+	spin_lock_bh(&br->lock);
 	list_for_each_entry(p, &br->port_list, list) {
 		if (p->state != BR_STATE_DISABLED)
 			br_stp_disable_port(p);
@@ -76,7 +76,7 @@ void br_stp_disable_bridge(struct net_bridge *br)
 
 	br->topology_change = 0;
 	br->topology_change_detected = 0;
-	spin_unlock(&br->lock);
+	spin_unlock_bh(&br->lock);
 
 	del_timer_sync(&br->hello_timer);
 	del_timer_sync(&br->topology_change_timer);