[SK_BUFF]: Introduce ipv6_hdr(), remove skb->nh.ipv6h

[linux-2.6] / net / ipv6 / ipcomp6.c

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 5724ba9f75de595f13f0e6f0e8459020f425f590..e2404a62968056afdacb013489ad31929f9b2c65 100644 (file)
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -79,7 +79,7 @@ static int ipcomp6_input(struct xfrm_state *x, struct sk_buff *skb)
        skb->ip_summed = CHECKSUM_NONE;
 
        /* Remove ipcomp header and decompress original payload */
-       iph = skb->nh.ipv6h;
+       iph = ipv6_hdr(skb);
        ipch = (void *)skb->data;
        skb->h.raw = skb->nh.raw + sizeof(*ipch);
        __skb_pull(skb, sizeof(*ipch));
@@ -166,10 +166,10 @@ static int ipcomp6_output(struct xfrm_state *x, struct sk_buff *skb)
        top_iph->payload_len = htons(skb->len - sizeof(struct ipv6hdr));
 
        ipch = (struct ipv6_comp_hdr *)start;
-       ipch->nexthdr = *skb->nh.raw;
+       ipch->nexthdr = *skb_network_header(skb);
        ipch->flags = 0;
        ipch->cpi = htons((u16 )ntohl(x->id.spi));
-       *skb->nh.raw = IPPROTO_COMP;
+       *skb_network_header(skb) = IPPROTO_COMP;
 
 out_ok:
        return 0;