diff options
-rw-r--r-- | net/ipv4/tcp_input.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 3ad6a19ad30f..79996b16b942 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -1554,20 +1554,15 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ | |||
1554 | } | 1554 | } |
1555 | 1555 | ||
1556 | /* Rest of the block already fully processed? */ | 1556 | /* Rest of the block already fully processed? */ |
1557 | if (!after(end_seq, cache->end_seq)) { | 1557 | if (!after(end_seq, cache->end_seq)) |
1558 | skb = tcp_maybe_skipping_dsack(skb, sk, next_dup, cache->end_seq, | ||
1559 | &fack_count, &reord, &flag); | ||
1560 | goto advance_sp; | 1558 | goto advance_sp; |
1561 | } | 1559 | |
1560 | skb = tcp_maybe_skipping_dsack(skb, sk, next_dup, cache->end_seq, | ||
1561 | &fack_count, &reord, &flag); | ||
1562 | 1562 | ||
1563 | /* ...tail remains todo... */ | 1563 | /* ...tail remains todo... */ |
1564 | if (TCP_SKB_CB(tp->highest_sack)->end_seq == cache->end_seq) { | 1564 | if (TCP_SKB_CB(tp->highest_sack)->end_seq == cache->end_seq) { |
1565 | /* ...but better entrypoint exists! Check that DSACKs are | 1565 | /* ...but better entrypoint exists! */ |
1566 | * properly accounted while skipping here | ||
1567 | */ | ||
1568 | tcp_maybe_skipping_dsack(skb, sk, next_dup, cache->end_seq, | ||
1569 | &fack_count, &reord, &flag); | ||
1570 | |||
1571 | skb = tcp_write_queue_next(sk, tp->highest_sack); | 1566 | skb = tcp_write_queue_next(sk, tp->highest_sack); |
1572 | fack_count = tp->fackets_out; | 1567 | fack_count = tp->fackets_out; |
1573 | cache++; | 1568 | cache++; |