aboutsummaryrefslogtreecommitdiff
path: root/net/sched/sch_netem.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-12-21 09:57:42 +0000
committerMark Brown <broonie@kernel.org>2018-12-21 09:57:42 +0000
commit4ab452c56f5c65636fbf1cf0a7b43cd5c05889b6 (patch)
tree24cb63796feaf1fe4d2bd8a6c2298c5974fdde62 /net/sched/sch_netem.c
parent43603a35574c2e594f9e10a97a40874d1282dd7e (diff)
parente95d10da90f48177a1ffd3fef90c9997977cfc24 (diff)
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlinux-linaro-lsk-v4.9-rt
Diffstat (limited to 'net/sched/sch_netem.c')
-rw-r--r--net/sched/sch_netem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 3f87ddb1777d..2e417c907a28 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -442,6 +442,9 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,
int count = 1;
int rc = NET_XMIT_SUCCESS;
+ /* Do not fool qdisc_drop_all() */
+ skb->prev = NULL;
+
/* Random duplication */
if (q->duplicate && q->duplicate >= get_crandom(&q->dup_cor))
++count;