Commit:     bb239acf5679ee1936f6b1b034ad260c4fec89c8
Parent:     4361cb17f0df5491fe6e2c3ae1defc98e9a64a79
Author:     Patrick McHardy <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 16 12:31:28 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:26:16 2007 -0700

    [NET_SCHED]: sch_cbq: fix watchdog scheduled too late
    q->now is increased during dequeue and doesn't contain the current time
    afterwards, resulting in a too large timeout value for the qdisc watchdog.
    Use "now" instead, which still contains the current time.
    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 0491fad..d83414d 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1070,7 +1070,7 @@ cbq_dequeue(struct Qdisc *sch)
                if (q->wd_expires)
-                                               q->now + q->wd_expires);
+                                               now + q->wd_expires);
        return NULL;
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