Commit:     e9054a339eb275c756efeeaee42af484ac72a3f4
Parent:     88a993540a65c38865f83961520494b4ad5d0363
Author:     Patrick McHardy <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 16 01:21:40 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:26:11 2007 -0700

    [NET_SCHED]: sch_cbq: fix cbq_undelay_prio for non-active priorites
    cbq_undelay_prio is supposed to return a time delta, but returns the
    current time for non-active priorities, causing cbq_undelay to mark
    the priority as active and schedule a timer for twice the current
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/sched/sch_cbq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index d29d121..32f6a30 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -612,7 +612,7 @@ static unsigned long cbq_undelay_prio(struct cbq_sched_data 
*q, int prio)
        unsigned long sched = now;
        if (cl_prev == NULL)
-               return now;
+               return 0;
        do {
                cl = cl_prev->next_alive;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to