---

yaml --- r: 45791 b: refs/heads/master c: 52d570a h: refs/heads/master i: 45789: a87443c 45787: d4a4f3a 45783: 9f30654 45775: e6e5f30 45759: ebba925 v: v3
git-mirror · Jan 24, 2007 · 57ef23c · 57ef23c
1 parent 52564c8
commit 57ef23c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);