---

yaml --- r: 108821 b: refs/heads/master c: 8608db0 h: refs/heads/master i: 108819: 2a6a77c v: v3
git-mirror · Aug 19, 2008 · 96baf06 · 96baf06
1 parent f6e8f34
commit 96baf06
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;
 }