diff options
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index a0217e5bf3bc..648db3fe508f 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1271,6 +1271,8 @@ route_lookup:  	if (max_headroom > dev->needed_headroom)  		dev->needed_headroom = max_headroom; +	skb_set_inner_ipproto(skb, proto); +  	err = ip6_tnl_encap(skb, t, &proto, fl6);  	if (err)  		return err; @@ -1280,8 +1282,6 @@ route_lookup:  		ipv6_push_frag_opts(skb, &opt.ops, &proto);  	} -	skb_set_inner_ipproto(skb, proto); -  	skb_push(skb, sizeof(struct ipv6hdr));  	skb_reset_network_header(skb);  	ipv6h = ipv6_hdr(skb); | 
