[NET_SCHED]: sch_cbq: fix watchdog scheduled too late
authorPatrick McHardy <kaber@trash.net>
Fri, 16 Mar 2007 19:31:28 +0000 (12:31 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 26 Apr 2007 05:26:16 +0000 (22:26 -0700)
commitbb239acf5679ee1936f6b1b034ad260c4fec89c8
tree3c52cd966844e708ac0c4da5a08956a943be6bd7
parent4361cb17f0df5491fe6e2c3ae1defc98e9a64a79
[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 <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_cbq.c