From 6886f2064b18fcf98dbfbfc9e73e35cb1a194853 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 22 Jul 2010 13:27:09 -0700
Subject: [PATCH] --- yaml --- r: 201311 b: refs/heads/master c:
 be2b6e62357dd7ee56bdcb05e54002afb4830292 h: refs/heads/master i:   201309:
 ee09c743c138fa9202c6dd794f2a69eb78365dfb   201307:
 ecf2e537252c859e4ab4a72c3577d40879fff7cb   201303:
 8c4b1588e1f4435b456ac9a47dfece58f5482eb4   201295:
 8d6a800e4a9bcc60d8245b89980a7c36ba0cdc65   201279:
 3ecf220a9adfd54f2b2bf16c90a435ca1bcfc859 v: v3

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

diff --git a/[refs] b/[refs]
index 10b10f773051..7701e1ab41aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00c5a9834b476a138158fb17d576da751727a9f1
+refs/heads/master: be2b6e62357dd7ee56bdcb05e54002afb4830292
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index c699159b3ede..ce88293a34e2 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -932,7 +932,8 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
 	copy_skb_header(n, skb);
 
 	off                  = newheadroom - oldheadroom;
-	n->csum_start       += off;
+	if (n->ip_summed == CHECKSUM_PARTIAL)
+		n->csum_start += off;
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
 	n->transport_header += off;
 	n->network_header   += off;