diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-11 00:06:25 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:28 -0400 |
commit | 39b89160df691045d1449cbaef43c02084c7543a (patch) | |
tree | bbe217599a1b84f3bf33c053e2c7d3bdf8bdd571 /net/ipv6/xfrm6_mode_beet.c | |
parent | b0061ce49c83657563b64ffcf1ec137110230d93 (diff) |
[SK_BUFF]: Introduce ipipv6_hdr(), remove skb->h.ipv6h
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_mode_beet.c')
-rw-r--r-- | net/ipv6/xfrm6_mode_beet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c index abac09409ded..0cc96ece003d 100644 --- a/net/ipv6/xfrm6_mode_beet.c +++ b/net/ipv6/xfrm6_mode_beet.c | |||
@@ -47,8 +47,8 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb) | |||
47 | 47 | ||
48 | skb_reset_network_header(skb); | 48 | skb_reset_network_header(skb); |
49 | top_iph = ipv6_hdr(skb); | 49 | top_iph = ipv6_hdr(skb); |
50 | skb->nh.raw = &top_iph->nexthdr; | 50 | skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr); |
51 | skb->h.ipv6h = top_iph + 1; | 51 | skb->nh.raw += offsetof(struct ipv6hdr, nexthdr); |
52 | 52 | ||
53 | ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr); | 53 | ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr); |
54 | ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr); | 54 | ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr); |