From: Tom Herbert <tom@herbertland.com>
Date: Tue, 10 May 2016 00:12:11 +0000 (-0700)
Subject: ip6: Don't set transport header in IPv6 tunneling
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4b4a0c91438c2471d7ab9504c0096ffc47d2389b;p=deliverable%2Flinux.git

ip6: Don't set transport header in IPv6 tunneling

We only need to reset network header here.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index ade55af6ace6..50af7061ecdb 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1114,8 +1114,6 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
 		dst_cache_set_ip6(&t->dst_cache, ndst, &fl6->saddr);
 	skb_dst_set(skb, dst);
 
-	skb->transport_header = skb->network_header;
-
 	if (encap_limit >= 0) {
 		init_tel_txopt(&opt, encap_limit);
 		ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);