summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorVijay Subramanian <subramanian.vijay@gmail.com>2012-01-19 10:20:59 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-22 15:08:44 -0500
commita42b4799c683723e8c464de4026af085b2ebd5fa (patch)
tree303ebae69ea9f9db0a5bdf7020dc26c01af14afd /net/sched
parent803143fbda719106017309d551d082e4b4e7c8c3 (diff)
downloadop-kernel-dev-a42b4799c683723e8c464de4026af085b2ebd5fa.zip
op-kernel-dev-a42b4799c683723e8c464de4026af085b2ebd5fa.tar.gz
netem: Fix off-by-one bug in reordering
With netem reordering, a gap of N is supposed to reorder every Nth packet with given reorder probability. However, the code currently skips N packets and reorders every (N+1)th packet. Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_netem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index e7e1d0b..2776012 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -419,7 +419,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
cb = netem_skb_cb(skb);
if (q->gap == 0 || /* not doing reordering */
- q->counter < q->gap || /* inside last reordering gap */
+ q->counter < q->gap - 1 || /* inside last reordering gap */
q->reorder < get_crandom(&q->reorder_cor)) {
psched_time_t now;
psched_tdiff_t delay;
OpenPOWER on IntegriCloud