diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-05-20 18:39:02 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-05-20 18:39:02 (GMT) |
| commit | b08bbdbf93d9862b77d41560c1447f37c3954930 (patch) | |
| tree | 1defef32b478eead9fbcfc4646900a4122a86172 /net/sched | |
| parent | 84df6e416de47ccca8845e584ef3683ad068b790 (diff) | |
| parent | dbf932a9b316d5b29b3e220e5a30e7a165ad2992 (diff) | |
| download | linux-fsl-qoriq-b08bbdbf93d9862b77d41560c1447f37c3954930.tar.xz | |
Merge tag 'v3.8.13'
This is the 3.8.13 stable release
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_cbq.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 0e19948..ced81a1 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -962,8 +962,11 @@ cbq_dequeue(struct Qdisc *sch) cbq_update(q); if ((incr -= incr2) < 0) incr = 0; + q->now += incr; + } else { + if (now > q->now) + q->now = now; } - q->now += incr; q->now_rt = now; for (;;) { |