diff options
Diffstat (limited to 'net/ipv6/xfrm6_mode_tunnel.c')
| -rw-r--r-- | net/ipv6/xfrm6_mode_tunnel.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c index 9fc95bc6509f..3dd40af75e81 100644 --- a/net/ipv6/xfrm6_mode_tunnel.c +++ b/net/ipv6/xfrm6_mode_tunnel.c @@ -38,10 +38,11 @@ static inline void ip6ip_ecn_decapsulate(struct sk_buff *skb) * payload_len * * On exit, skb->h will be set to the start of the encapsulation header to be - * filled in by x->type->output and skb->nh will be set to the nextheader field - * of the extension header directly preceding the encapsulation header, or in - * its absence, that of the top IP header. The value of skb->data will always - * point to the top IP header. + * filled in by x->type->output and the mac header will be set to the + * nextheader field of the extension header directly preceding the + * encapsulation header, or in its absence, that of the top IP header. + * The value of skb->data and the network header will always point to the + * top IP header. */ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) { @@ -53,10 +54,10 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) skb_push(skb, x->props.header_len); iph = ipv6_hdr(skb); + skb_set_mac_header(skb, offsetof(struct ipv6hdr, nexthdr)); skb_reset_network_header(skb); + skb_set_transport_header(skb, sizeof(struct ipv6hdr)); top_iph = ipv6_hdr(skb); - skb->transport_header = skb->network_header + sizeof(struct ipv6hdr); - skb->network_header += offsetof(struct ipv6hdr, nexthdr); top_iph->version = 6; if (xdst->route->ops->family == AF_INET6) { |