From 26f063da1bddb1cce0f6357143072b905cd25944 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Mon, 24 Dec 2012 16:51:03 +0000
Subject: [PATCH] --- yaml --- r: 348029 b: refs/heads/master c:
 861aa6d56de8147249c8a04a4e87fb7c3600cca1 h: refs/heads/master i:   348027:
 e3f291f586cac5171b1b2031368211e31eaa1c23 v: v3

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

diff --git a/[refs] b/[refs]
index befec63e4fff..9d042a1178f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a49675988c127b5b5876c252e5db2ee0410a10c2
+refs/heads/master: 861aa6d56de8147249c8a04a4e87fb7c3600cca1
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
index 58cb627560dd..303012adf9e6 100644
--- a/trunk/net/ipv4/ip_gre.c
+++ b/trunk/net/ipv4/ip_gre.c
@@ -912,9 +912,9 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
 		/* Warning : tiph value might point to freed memory */
 	}
 
-	skb_reset_transport_header(skb);
 	skb_push(skb, gre_hlen);
 	skb_reset_network_header(skb);
+	skb_set_transport_header(skb, sizeof(*iph));
 	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
 	IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
 			      IPSKB_REROUTED);