1 files changed, 8 insertions, 1 deletions

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index c412ad0d0308..298c0ddfb57e 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -380,7 +380,14 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                 return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
         }
 
-        skb_orphan(skb);
+        /* If a delay is expected, orphan the skb. (orphaning usually takes
+         * place at TX completion time, so _before_ the link transit delay)
+         * Ideally, this orphaning should be done after the rate limiting
+         * module, because this breaks TCP Small Queue, and other mechanisms
+         * based on socket sk_wmem_alloc.
+         */
+        if (q->latency || q->jitter)
+                skb_orphan(skb);
 
         /*
          * If we need to duplicate packet, then re-insert at top of the