From: Patrick McHardy <kaber@trash.net>
Date: Fri, 16 Mar 2007 19:31:28 +0000 (-0700)
Subject: [NET_SCHED]: sch_cbq: fix watchdog scheduled too late
X-Git-Tag: v2.6.22-rc1~1128^2~268
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb239acf5679ee1936f6b1b034ad260c4fec89c8;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed