diff options
author | Scott Wood <scottwood@freescale.com> | 2013-04-17 21:27:27 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2013-04-17 21:27:27 (GMT) |
commit | 8da5cdaa7d6304f376b255c125e32a295da97954 (patch) | |
tree | 1f9f82555ad75ab977c53d7cb192c587b34bab18 /net/sched | |
parent | c29142c0d3942e2c59ad3b9f780780e65f167d3a (diff) | |
parent | 2396403a0402caf7b9decbc5d206fa63ba62b6b7 (diff) | |
download | linux-fsl-qoriq-8da5cdaa7d6304f376b255c125e32a295da97954.tar.xz |
Merge tag 'v3.8.8'
This is the 3.8.8 stable release
Conflicts:
include/linux/preempt.h
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_fq_codel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c index 4e606fc..5578628 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++; |