From 8aa420ca6eed4f75518d902008a84d988a3dbfda Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Mon, 12 Jan 2009 21:54:16 -0800
Subject: [PATCH] --- yaml --- r: 129723 b: refs/heads/master c:
 c08513471911cf33cb50249a7ff12848374f7263 h: refs/heads/master i:   129721:
 68a01155d0823eef87961e5cb0a34b222a31ec41   129719:
 987e1acb1748b54f7b65630d4b04e76e4f2ee8ff v: v3

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

diff --git a/[refs] b/[refs]
index 511085572cbf..1261fecdb7ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daaf83d2b9277928739f3eb7ea64f49c1254fd62
+refs/heads/master: c08513471911cf33cb50249a7ff12848374f7263
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index 5070643ce534..9ca8a26ba507 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/net/sched/sch_htb.c
@@ -685,8 +685,8 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level)
 		if (cl->cmode != HTB_CAN_SEND)
 			htb_add_to_wait_tree(q, cl, diff);
 	}
-	/* too much load - let's continue on next jiffie */
-	return q->now + PSCHED_TICKS_PER_SEC / HZ;
+	/* too much load - let's continue on next jiffie (including above) */
+	return q->now + 2 * PSCHED_TICKS_PER_SEC / HZ;
 }
 
 /* Returns class->node+prio from id-tree where classe's id is >= id. NULL
@@ -873,7 +873,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
 		} else
 			event = q->near_ev_cache[level];
 
-		if (event && next_event > event)
+		if (next_event > event)
 			next_event = event;
 
 		m = ~q->row_mask[level];