aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index a69a34f57330..a85e8a282d17 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2132,6 +2132,7 @@ static int tcp_mtu_probe(struct sock *sk)
2132 nskb->ip_summed = skb->ip_summed; 2132 nskb->ip_summed = skb->ip_summed;
2133 2133
2134 tcp_insert_write_queue_before(nskb, skb, sk); 2134 tcp_insert_write_queue_before(nskb, skb, sk);
2135 tcp_highest_sack_replace(sk, skb, nskb);
2135 2136
2136 len = 0; 2137 len = 0;
2137 tcp_for_write_queue_from_safe(skb, next, sk) { 2138 tcp_for_write_queue_from_safe(skb, next, sk) {
@@ -2735,7 +2736,7 @@ static bool tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb)
2735 else if (!skb_shift(skb, next_skb, next_skb_size)) 2736 else if (!skb_shift(skb, next_skb, next_skb_size))
2736 return false; 2737 return false;
2737 } 2738 }
2738 tcp_highest_sack_combine(sk, next_skb, skb); 2739 tcp_highest_sack_replace(sk, next_skb, skb);
2739 2740
2740 if (next_skb->ip_summed == CHECKSUM_PARTIAL) 2741 if (next_skb->ip_summed == CHECKSUM_PARTIAL)
2741 skb->ip_summed = CHECKSUM_PARTIAL; 2742 skb->ip_summed = CHECKSUM_PARTIAL;