diff options
| author | Tom Herbert <tom@herbertland.com> | 2016-05-10 02:12:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-10 06:39:27 +0200 |
| commit | 4b4a0c91438c2471d7ab9504c0096ffc47d2389b (patch) | |
| tree | 2ff778c2dc4e8bc5138fd67b3193d9b58dae6e90 /net/ipv6/ip6_tunnel.c | |
| parent | ip6_gre: Set inner protocol correctly in __gre6_xmit (diff) | |
| download | linux-4b4a0c91438c2471d7ab9504c0096ffc47d2389b.tar.xz linux-4b4a0c91438c2471d7ab9504c0096ffc47d2389b.zip | |
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>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 0 insertions, 2 deletions
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); |