aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-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 32c1a972fa31..23e32c806916 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1650,7 +1650,8 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m
1650 1650
1651 memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size); 1651 memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size);
1652 1652
1653 skb->ip_summed = next_skb->ip_summed; 1653 if (next_skb->ip_summed == CHECKSUM_PARTIAL)
1654 skb->ip_summed = CHECKSUM_PARTIAL;
1654 1655
1655 if (skb->ip_summed != CHECKSUM_PARTIAL) 1656 if (skb->ip_summed != CHECKSUM_PARTIAL)
1656 skb->csum = csum_block_add(skb->csum, next_skb->csum, skb_size); 1657 skb->csum = csum_block_add(skb->csum, next_skb->csum, skb_size);