X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=net%2Fsched%2Fsch_netem.c;h=a6d788d45216a6f286e5aaea0cdb0587cd0f7848;hb=f2f872f9272a79a1048877ea14c15576f46c225e;hp=82f6016d89abac391a8f0c03fdda7be6db2372b7;hpb=f2ec26a3d41c8a07861aed23bc8c8eb7d9445d62;p=cascardo%2Flinux.git

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 82f6016d89ab..a6d788d45216 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -412,12 +412,9 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 
 	/* 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);
+		skb_orphan_partial(skb);
 
 	/*
 	 * If we need to duplicate packet, then re-insert at top of the