From: David S. Miller <davem@davemloft.net>
Date: Fri, 25 Jul 2008 08:25:04 +0000 (-0700)
Subject: pkt_sched: Fix locking in shutdown_scheduler_queue()
X-Git-Tag: v2.6.27-rc1~211^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cffe1c5d7a5a1e54f7c2c6d0510f651a965bccc3;p=linux-2.6-omap-h63xx.git

pkt_sched: Fix locking in shutdown_scheduler_queue()

Qdisc locks need to be held with BH disabled.

Tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 4ac7e3a8c25..43abd4d27ea 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -736,9 +736,9 @@ static void shutdown_scheduler_queue(struct net_device *dev,
 		dev_queue->qdisc = qdisc_default;
 		dev_queue->qdisc_sleeping = qdisc_default;
 
-		spin_lock(root_lock);
+		spin_lock_bh(root_lock);
 		qdisc_destroy(qdisc);
-		spin_unlock(root_lock);
+		spin_unlock_bh(root_lock);
 	}
 }