From 7443bd40348fc3b46a777c025cb87892b88e8f88 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 23 May 2007 23:39:54 -0700
Subject: [PATCH] --- yaml --- r: 56981 b: refs/heads/master c:
 2e4b3b0e8734d1173c96c6f5d8a8dd6728950b56 h: refs/heads/master i:   56979:
 032336d6a4e5d4745eb5f76cc5ceeae637fb5b5c v: v3

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

diff --git a/[refs] b/[refs]
index 02cc6c030671..b2cb01de412c 100644
--- 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
index 99bcec8dd04c..035788c5b7f8 100644
--- 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];