From 5b539fe95d307ebc5854f633670bdfabf1902652 Mon Sep 17 00:00:00 2001
From: Andrea Shepard <andrea@persephoneslair.org>
Date: Thu, 22 Jul 2010 09:12:35 +0000
Subject: [PATCH] --- yaml --- r: 201310 b: refs/heads/master c:
 00c5a9834b476a138158fb17d576da751727a9f1 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2bfba146a7c0..10b10f773051 100644
--- 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
index 34432b4e96bb..c699159b3ede 100644
--- 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;