From 57ef23c642878302b7507701d3bfad016e4d4e7d Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@o2.pl>
Date: Tue, 23 Jan 2007 22:07:12 -0800
Subject: [PATCH] --- yaml --- r: 45791 b: refs/heads/master c:
 52d570aabe921663a987b2e4bae2bdc411cee480 h: refs/heads/master i:   45789:
 a87443c7797be02642257a1739d476f8dcf0a781   45787:
 d4a4f3a0b3c84a5114f89ae02b95a83187d20581   45783:
 9f30654d20015a51d3a644835a88dd169551f521   45775:
 e6e5f30b2bdb867facfeceddcb87bb238d95e77b   45759:
 ebba9250e88bf4f28ffb7473c17b2fd7c0a4673e v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv4/tcp_output.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1af8cb6ad253..9c7c35aad6d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf1c1ee88008fd639ebb5c74f0555fd414369bdc
+refs/heads/master: 52d570aabe921663a987b2e4bae2bdc411cee480
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
index 32c1a972fa31..23e32c806916 100644
--- a/trunk/net/ipv4/tcp_output.c
+++ b/trunk/net/ipv4/tcp_output.c
@@ -1650,7 +1650,8 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m
 
 		memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size);
 
-		skb->ip_summed = next_skb->ip_summed;
+		if (next_skb->ip_summed == CHECKSUM_PARTIAL)
+			skb->ip_summed = CHECKSUM_PARTIAL;
 
 		if (skb->ip_summed != CHECKSUM_PARTIAL)
 			skb->csum = csum_block_add(skb->csum, next_skb->csum, skb_size);