diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 21:06:25 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:25:28 -0700 |
commit | 39b89160df691045d1449cbaef43c02084c7543a (patch) | |
tree | bbe217599a1b84f3bf33c053e2c7d3bdf8bdd571 /net/ipv6/xfrm6_mode_beet.c | |
parent | b0061ce49c83657563b64ffcf1ec137110230d93 (diff) | |
download | kernel_goldelico_gta04-39b89160df691045d1449cbaef43c02084c7543a.zip kernel_goldelico_gta04-39b89160df691045d1449cbaef43c02084c7543a.tar.gz kernel_goldelico_gta04-39b89160df691045d1449cbaef43c02084c7543a.tar.bz2 |
[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 abac094..0cc96ec 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) skb_reset_network_header(skb); top_iph = ipv6_hdr(skb); - skb->nh.raw = &top_iph->nexthdr; - skb->h.ipv6h = top_iph + 1; + skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr); + skb->nh.raw += offsetof(struct ipv6hdr, nexthdr); ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr); ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr); |