---

yaml --- r: 201310 b: refs/heads/master c: 00c5a98 h: refs/heads/master v: v3
git-mirror · Jul 22, 2010 · 5b539fe · 5b539fe
1 parent ee09c74
commit 5b539fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a35747a5d13b99e076b0222729e0caa48cb69b6
+refs/heads/master: 00c5a9834b476a138158fb17d576da751727a9f1
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -843,7 +843,9 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
 	skb->network_header   += off;
 	if (skb_mac_header_was_set(skb))
 		skb->mac_header += off;
-	skb->csum_start       += nhead;
+	/* Only adjust this if it actually is csum_start rather than csum */
+	if (skb->ip_summed == CHECKSUM_PARTIAL)
+		skb->csum_start += nhead;
 	skb->cloned   = 0;
 	skb->hdr_len  = 0;
 	skb->nohdr    = 0;