tree 3c52cd966844e708ac0c4da5a08956a943be6bd7
parent 4361cb17f0df5491fe6e2c3ae1defc98e9a64a79
author Patrick McHardy <kaber@trash.net> 1174073488 -0700
committer David S. Miller <davem@sunset.davemloft.net> 1177565176 -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 <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>