From 0aac7c20d7a15e1ef2ed28f8d669c1b10b9873d0 Mon Sep 17 00:00:00 2001
From: Pravin B Shelar <pshelar@nicira.com>
Date: Fri, 8 Mar 2013 15:12:52 +0000
Subject: [PATCH] --- yaml --- r: 368172 b: refs/heads/master c:
 4f3ed9209f7f75ff0ee21bc5052d76542dd75b5f h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/net/ipv4/ipip.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 75c01c23b589..16fd0c947571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8344bfc6008d1c7b8b541bb25de7dfacb2188b95
+refs/heads/master: 4f3ed9209f7f75ff0ee21bc5052d76542dd75b5f
diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c
index 18f535299ef9..b50435ba0ce5 100644
--- a/trunk/net/ipv4/ipip.c
+++ b/trunk/net/ipv4/ipip.c
@@ -483,11 +483,6 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	if (skb->protocol != htons(ETH_P_IP))
 		goto tx_error;
-
-	if (skb->ip_summed == CHECKSUM_PARTIAL &&
-	    skb_checksum_help(skb))
-		goto tx_error;
-
 	old_iph = ip_hdr(skb);
 
 	if (tos & 1)
@@ -572,6 +567,13 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 		old_iph = ip_hdr(skb);
 	}
 
+	if (!skb->encapsulation) {
+		skb_reset_inner_headers(skb);
+		skb->encapsulation = 1;
+	}
+	if (skb->ip_summed != CHECKSUM_PARTIAL)
+		skb->ip_summed = CHECKSUM_NONE;
+
 	skb->transport_header = skb->network_header;
 	skb_push(skb, sizeof(struct iphdr));
 	skb_reset_network_header(skb);
@@ -599,7 +601,6 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 		iph->ttl	=	old_iph->ttl;
 
 	nf_reset(skb);
-	skb->ip_summed = CHECKSUM_NONE;
 
 	pkt_len = skb->len - skb_transport_offset(skb);
 	err = ip_local_out(skb);