diff options
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_netem.c | 5 |
1 files changed, 1 insertions, 4 deletions
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) | |||
| 412 | 412 | ||
| 413 | /* If a delay is expected, orphan the skb. (orphaning usually takes | 413 | /* If a delay is expected, orphan the skb. (orphaning usually takes |
| 414 | * place at TX completion time, so _before_ the link transit delay) | 414 | * place at TX completion time, so _before_ the link transit delay) |
| 415 | * Ideally, this orphaning should be done after the rate limiting | ||
| 416 | * module, because this breaks TCP Small Queue, and other mechanisms | ||
| 417 | * based on socket sk_wmem_alloc. | ||
| 418 | */ | 415 | */ |
| 419 | if (q->latency || q->jitter) | 416 | if (q->latency || q->jitter) |
| 420 | skb_orphan(skb); | 417 | skb_orphan_partial(skb); |
| 421 | 418 | ||
| 422 | /* | 419 | /* |
| 423 | * If we need to duplicate packet, then re-insert at top of the | 420 | * If we need to duplicate packet, then re-insert at top of the |