---

yaml --- r: 56981 b: refs/heads/master c: 2e4b3b0 h: refs/heads/master i: 56979: 032336d v: v3
git-mirror · May 24, 2007 · 7443bd4 · 7443bd4
1 parent 3ad0720
commit 7443bd4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b07a95a5be77dc1291de12b216f930aee04eb4f
+refs/heads/master: 2e4b3b0e8734d1173c96c6f5d8a8dd6728950b56
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
@@ -976,8 +976,9 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
 
 		if (q->now >= q->near_ev_cache[level]) {
 			event = htb_do_events(q, level);
-			q->near_ev_cache[level] = event ? event :
-							  PSCHED_TICKS_PER_SEC;
+			if (!event)
+				event = q->now + PSCHED_TICKS_PER_SEC;
+			q->near_ev_cache[level] = event;
 		} else
 			event = q->near_ev_cache[level];