diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bridge/br_stp_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index cc047f7fb6ef..35cf3a074087 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c | |||
@@ -67,7 +67,7 @@ void br_stp_disable_bridge(struct net_bridge *br) | |||
67 | { | 67 | { |
68 | struct net_bridge_port *p; | 68 | struct net_bridge_port *p; |
69 | 69 | ||
70 | spin_lock(&br->lock); | 70 | spin_lock_bh(&br->lock); |
71 | list_for_each_entry(p, &br->port_list, list) { | 71 | list_for_each_entry(p, &br->port_list, list) { |
72 | if (p->state != BR_STATE_DISABLED) | 72 | if (p->state != BR_STATE_DISABLED) |
73 | br_stp_disable_port(p); | 73 | br_stp_disable_port(p); |
@@ -76,7 +76,7 @@ void br_stp_disable_bridge(struct net_bridge *br) | |||
76 | 76 | ||
77 | br->topology_change = 0; | 77 | br->topology_change = 0; |
78 | br->topology_change_detected = 0; | 78 | br->topology_change_detected = 0; |
79 | spin_unlock(&br->lock); | 79 | spin_unlock_bh(&br->lock); |
80 | 80 | ||
81 | del_timer_sync(&br->hello_timer); | 81 | del_timer_sync(&br->hello_timer); |
82 | del_timer_sync(&br->topology_change_timer); | 82 | del_timer_sync(&br->topology_change_timer); |