diff options
Diffstat (limited to 'net/ipv6/xfrm6_mode_beet.c')
-rw-r--r-- | net/ipv6/xfrm6_mode_beet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c index 247e2d5d2acf..b5a48c255f07 100644 --- a/net/ipv6/xfrm6_mode_beet.c +++ b/net/ipv6/xfrm6_mode_beet.c | |||
@@ -38,7 +38,7 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) | |||
38 | int hdr_len; | 38 | int hdr_len; |
39 | 39 | ||
40 | skb_push(skb, x->props.header_len); | 40 | skb_push(skb, x->props.header_len); |
41 | iph = skb->nh.ipv6h; | 41 | iph = ipv6_hdr(skb); |
42 | 42 | ||
43 | hdr_len = ip6_find_1stfragopt(skb, &prevhdr); | 43 | hdr_len = ip6_find_1stfragopt(skb, &prevhdr); |
44 | skb->nh.raw = prevhdr - x->props.header_len; | 44 | skb->nh.raw = prevhdr - x->props.header_len; |
@@ -46,7 +46,7 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) | |||
46 | memmove(skb->data, iph, hdr_len); | 46 | memmove(skb->data, iph, hdr_len); |
47 | 47 | ||
48 | skb_reset_network_header(skb); | 48 | skb_reset_network_header(skb); |
49 | top_iph = skb->nh.ipv6h; | 49 | top_iph = ipv6_hdr(skb); |
50 | skb->nh.raw = &top_iph->nexthdr; | 50 | skb->nh.raw = &top_iph->nexthdr; |
51 | skb->h.ipv6h = top_iph + 1; | 51 | skb->h.ipv6h = top_iph + 1; |
52 | 52 | ||
@@ -74,7 +74,7 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb) | |||
74 | skb_set_mac_header(skb, -skb->mac_len); | 74 | skb_set_mac_header(skb, -skb->mac_len); |
75 | memmove(skb_mac_header(skb), old_mac, skb->mac_len); | 75 | memmove(skb_mac_header(skb), old_mac, skb->mac_len); |
76 | 76 | ||
77 | ip6h = skb->nh.ipv6h; | 77 | ip6h = ipv6_hdr(skb); |
78 | ip6h->payload_len = htons(skb->len - size); | 78 | ip6h->payload_len = htons(skb->len - size); |
79 | ipv6_addr_copy(&ip6h->daddr, (struct in6_addr *) &x->sel.daddr.a6); | 79 | ipv6_addr_copy(&ip6h->daddr, (struct in6_addr *) &x->sel.daddr.a6); |
80 | ipv6_addr_copy(&ip6h->saddr, (struct in6_addr *) &x->sel.saddr.a6); | 80 | ipv6_addr_copy(&ip6h->saddr, (struct in6_addr *) &x->sel.saddr.a6); |