diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-10-29 20:03:43 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-10-29 20:03:43 (GMT) |
| commit | ae60d5d27c429b13cf28a09ab8b9d30682433c5a (patch) | |
| tree | 16b67511ef66b0580c267a5438d1face3a3778e6 /net/sched | |
| parent | b095c5c2577aeedce2db847fa117596628d4e7cb (diff) | |
| parent | d0ebef8230e267ec47d4d4a65fe3262e2ebb8026 (diff) | |
| download | linux-fsl-qoriq-ae60d5d27c429b13cf28a09ab8b9d30682433c5a.tar.xz | |
Revert to 3.8 (no rt, no stable)
This is a merge from rtmerge, which has been similarly reverted.
Conflicts:
drivers/crypto/caam/caamalg.c
drivers/misc/Makefile
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_cbq.c | 5 | ||||
| -rw-r--r-- | net/sched/sch_fq_codel.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index ced81a1..0e19948 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -962,11 +962,8 @@ 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 (;;) { diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c index 5578628..4e606fc 100644 --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c @@ -195,7 +195,7 @@ static int fq_codel_enqueue(struct sk_buff *skb, struct Qdisc *sch) flow->deficit = q->quantum; flow->dropped = 0; } - if (++sch->q.qlen <= sch->limit) + if (++sch->q.qlen < sch->limit) return NET_XMIT_SUCCESS; q->drop_overlimit++; |