From 3696b5de34c8ba1525ec7c5da6b5058a7ee6307a Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Mon, 18 Feb 2013 09:50:52 +0000
Subject: [PATCH] --- yaml --- r: 352785 b: refs/heads/master c:
 aa0e51cdda005cd37e23751de54443b1e73e7def h: refs/heads/master i:   352783:
 ea814349c9d0f0f8b3ca8804e6aec69e7df82b36 v: v3

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

diff --git a/[refs] b/[refs]
index 0a2d41287927..150a2c73a2ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0809dbc47dea83eba7a9abb70e87470904d4372
+refs/heads/master: aa0e51cdda005cd37e23751de54443b1e73e7def
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
index a56f1182c176..cdc31ac4a9df 100644
--- a/trunk/net/ipv4/ip_gre.c
+++ b/trunk/net/ipv4/ip_gre.c
@@ -745,12 +745,9 @@ static struct sk_buff *handle_offloads(struct sk_buff *skb)
 			goto error;
 		skb_shinfo(skb)->gso_type |= SKB_GSO_GRE;
 		return skb;
-	} else if (skb->ip_summed == CHECKSUM_PARTIAL) {
-		err = skb_checksum_help(skb);
-		if (unlikely(err))
-			goto error;
 	}
-	skb->ip_summed = CHECKSUM_NONE;
+	if (skb->ip_summed != CHECKSUM_PARTIAL)
+		skb->ip_summed = CHECKSUM_NONE;
 
 	return skb;