diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-03 07:31:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-03 07:31:54 +0200 |
| commit | d66248326410ed0d3e813ebe974b3e6638df0717 (patch) | |
| tree | a1dbe86f5540596a70c6f3b9aab051d37f37daf5 /net/sched | |
| parent | net: fix smatch warnings inside datagram_poll (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-d66248326410ed0d3e813ebe974b3e6638df0717.tar.xz linux-d66248326410ed0d3e813ebe974b3e6638df0717.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull net into net-next to get the synchronize_net() bug fix in
bonding.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 13aa47aa2ffb..1bc210ffcba2 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 (;;) { |