From: Patrick McHardy <kaber@trash.net>
Date: Thu, 24 May 2007 06:39:54 +0000 (-0700)
Subject: [NET_SCHED]: sch_htb: fix event cache time calculation
X-Git-Tag: v2.6.22-rc3~9^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2e4b3b0e8734d1173c96c6f5d8a8dd6728950b56;p=linux-2.6-omap-h63xx.git

[NET_SCHED]: sch_htb: fix event cache time calculation

The event cache time must be an absolute value, when no event exists
it is incorrectly set to 1s instead of 1s in the future.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 99bcec8dd04..035788c5b7f 100644
--- a/net/sched/sch_htb.c
+++ b/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];