]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ip6: Don't set transport header in IPv6 tunneling
authorTom Herbert <tom@herbertland.com>
Tue, 10 May 2016 00:12:11 +0000 (17:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 04:39:27 +0000 (00:39 -0400)
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>
net/ipv6/ip6_tunnel.c

index ade55af6ace6b1b090d58854244d661997b8b0af..50af7061ecdbee6ed7b9fe73c5a6ceb123a8d2ea 100644 (file)
@@ -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);