From f19b8141b254202f522171b61b26b222ebb77f23 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Mon, 24 Dec 2012 16:51:04 +0000
Subject: [PATCH] --- yaml --- r: 348030 b: refs/heads/master c:
 ae782bb16c35ce27512beeda9be6024c88f85b08 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9d042a1178f3..7f8add2111a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 861aa6d56de8147249c8a04a4e87fb7c3600cca1
+refs/heads/master: ae782bb16c35ce27512beeda9be6024c88f85b08
diff --git a/trunk/net/ipv6/ip6_gre.c b/trunk/net/ipv6/ip6_gre.c
index 867466c96aac..c727e4712751 100644
--- a/trunk/net/ipv6/ip6_gre.c
+++ b/trunk/net/ipv6/ip6_gre.c
@@ -758,8 +758,6 @@ static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb,
 		skb_dst_set_noref(skb, dst);
 	}
 
-	skb->transport_header = skb->network_header;
-
 	proto = NEXTHDR_GRE;
 	if (encap_limit >= 0) {
 		init_tel_txopt(&opt, encap_limit);
@@ -768,6 +766,7 @@ static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb,
 
 	skb_push(skb, gre_hlen);
 	skb_reset_network_header(skb);
+	skb_set_transport_header(skb, sizeof(*ipv6h));
 
 	/*
 	 *	Push down and install the IP header.