From 96baf0622cbb06dc0160c76e280058c05a6c5403 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 18 Aug 2008 20:51:18 -0700
Subject: [PATCH] --- yaml --- r: 108821 b: refs/heads/master c:
 8608db031b4d2932d645709e2cfe8fbcd91a7305 h: refs/heads/master i:   108819:
 2a6a77ce1a2a75849271c42e9145a76a5f9ad861 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_api.c | 2 +-
 trunk/net/sched/sch_cbq.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 36422342d414..050c9418e042 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69747650c814a8a79fef412c7416adf823293a3e
+refs/heads/master: 8608db031b4d2932d645709e2cfe8fbcd91a7305
diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c
index c8dc72e12107..98c00847a3d2 100644
--- a/trunk/net/sched/sch_api.c
+++ b/trunk/net/sched/sch_api.c
@@ -426,7 +426,7 @@ static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)
 
 	wd->qdisc->flags &= ~TCQ_F_THROTTLED;
 	smp_wmb();
-	__netif_schedule(wd->qdisc);
+	__netif_schedule(qdisc_root(wd->qdisc));
 
 	return HRTIMER_NORESTART;
 }
diff --git a/trunk/net/sched/sch_cbq.c b/trunk/net/sched/sch_cbq.c
index 4e261ce62f48..47ef492c4ff4 100644
--- a/trunk/net/sched/sch_cbq.c
+++ b/trunk/net/sched/sch_cbq.c
@@ -654,7 +654,7 @@ static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)
 	}
 
 	sch->flags &= ~TCQ_F_THROTTLED;
-	__netif_schedule(sch);
+	__netif_schedule(qdisc_root(sch));
 	return HRTIMER_NORESTART;
 }