diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-06 17:32:55 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-06 17:33:38 -0800 |
| commit | ae0d0bb29b311ee3c71c8796f76d309a3779c8d9 (patch) | |
| tree | ae8e6f90d4eec5594bf42fe7aa9c3d989fc4317e /net/ipv6/ip6_tunnel.c | |
| parent | 9f32c27eb4fc4426eedd511697d921a932f7dba6 (diff) | |
| parent | bf3e76289cd28b87f679cd53e26d67fd708d718a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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 e3e7859e2ef7..74a6ea9f8862 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1270,6 +1270,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; @@ -1279,8 +1281,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); |