From 4b17c9d80e29b3a17edbbebe4072b0d430feb087 Mon Sep 17 00:00:00 2001 From: Adrian Drzewiecki Date: Wed, 15 Feb 2006 01:47:48 -0800 Subject: [PATCH] --- yaml --- r: 20335 b: refs/heads/master c: 78872ccb68335b14f0d1ac7338ecfcbf1cba1df4 h: refs/heads/master i: 20333: 87eec33a964f8d3cbe81c61dcbed0b28a0bcec7f 20331: 28c47aeeb4c459b0c402474a058d3438b6a297c0 20327: a8b1bf4b6f17be215dc2074b8904ecc9b718a0ff 20319: 8571eec566314993b92c80ffb743a8f0af866cfd v: v3 --- [refs] | 2 +- trunk/net/bridge/br_stp_if.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 02fc750a4e99..fe57fd6dc2d3 100644 --- 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 index cc047f7fb6ef..35cf3a074087 100644 --- 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);