The patch titled
     sch_htb: fix event cache time calculation
has been removed from the -mm tree.  Its filename was
     sch_htb-fix-event-cache-time-calculation.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: sch_htb: fix event cache time calculation
From: Patrick McHardy <[EMAIL PROTECTED]>

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.

Should fix excessive load reported by Anant Nitya <[EMAIL PROTECTED]>.

Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 net/sched/sch_htb.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -puN net/sched/sch_htb.c~sch_htb-fix-event-cache-time-calculation 
net/sched/sch_htb.c
--- a/net/sched/sch_htb.c~sch_htb-fix-event-cache-time-calculation
+++ a/net/sched/sch_htb.c
@@ -976,8 +976,9 @@ static struct sk_buff *htb_dequeue(struc
 
                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];
 
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

make-some-netfilter-related-proc-files-use-seq_list_xxx.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to