X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fsched%2Fsch_cbq.c;h=8fa90d68ec6d8ab2f7ac47efcd511e31553bece6;hb=cc556c5c92a45763e23015a31efb27005a6132fa;hp=47ef492c4ff40ad23735aa6254885b503e094e2f;hpb=d2805395aadc105d7228511eb0f42d9eea912003;p=linux-2.6

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 47ef492c4f..8fa90d68ec 100644
--- a/net/sched/sch_cbq.c
+++ b/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;