From e9573478935575dda372107cb31e26ab1f411c77 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Thu, 21 Aug 2008 05:11:14 -0700
Subject: [PATCH] --- yaml --- r: 109080 b: refs/heads/master c:
 2540e0511ea17e25831be543cdf9381e6209950d h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/net/sch_generic.h | 5 +++++
 trunk/net/sched/sch_api.c       | 4 ++++
 trunk/net/sched/sch_cbq.c       | 4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2a4bce081a77..b0288a5369ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e739d1752aca4e8f3e794d431503bfca3162df4
+refs/heads/master: 2540e0511ea17e25831be543cdf9381e6209950d
diff --git a/trunk/include/net/sch_generic.h b/trunk/include/net/sch_generic.h
index 84d25f2e6188..b1d2cfea89c5 100644
--- a/trunk/include/net/sch_generic.h
+++ b/trunk/include/net/sch_generic.h
@@ -193,6 +193,11 @@ static inline struct Qdisc *qdisc_root(struct Qdisc *qdisc)
 	return qdisc->dev_queue->qdisc;
 }
 
+static inline struct Qdisc *qdisc_root_sleeping(struct Qdisc *qdisc)
+{
+	return qdisc->dev_queue->qdisc_sleeping;
+}
+
 /* The qdisc root lock is a mechanism by which to top level
  * of a qdisc tree can be locked from any qdisc node in the
  * forest.  This allows changing the configuration of some
diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c
index ef0efeca6352..45f442d7de47 100644
--- a/trunk/net/sched/sch_api.c
+++ b/trunk/net/sched/sch_api.c
@@ -444,6 +444,10 @@ void qdisc_watchdog_schedule(struct qdisc_watchdog *wd, psched_time_t expires)
 {
 	ktime_t time;
 
+	if (test_bit(__QDISC_STATE_DEACTIVATED,
+		     &qdisc_root_sleeping(wd->qdisc)->state))
+		return;
+
 	wd->qdisc->flags |= TCQ_F_THROTTLED;
 	time = ktime_set(0, 0);
 	time = ktime_add_ns(time, PSCHED_US2NS(expires));
diff --git a/trunk/net/sched/sch_cbq.c b/trunk/net/sched/sch_cbq.c
index 47ef492c4ff4..8fa90d68ec6d 100644
--- a/trunk/net/sched/sch_cbq.c
+++ b/trunk/net/sched/sch_cbq.c
@@ -521,6 +521,10 @@ static void cbq_ovl_delay(struct cbq_class *cl)
 	struct cbq_sched_data *q = qdisc_priv(cl->qdisc);
 	psched_tdiff_t delay = cl->undertime - q->now;
 
+	if (test_bit(__QDISC_STATE_DEACTIVATED,
+		     &qdisc_root_sleeping(cl->qdisc)->state))
+		return;
+
 	if (!cl->delayed) {
 		psched_time_t sched = q->now;
 		ktime_t expires;