[SK_BUFF]: Introduce skb_set_transport_header

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

diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
index edcfffa9e87b1395723cbf5e07df05ed3bca43ee..abac09409ded7d6ba5449b5b9b456ff280552735 100644 (file)
--- a/net/ipv6/xfrm6_mode_beet.c
+++ b/net/ipv6/xfrm6_mode_beet.c
@@ -38,15 +38,15 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
        int hdr_len;
 
        skb_push(skb, x->props.header_len);
-       iph = skb->nh.ipv6h;
+       iph = ipv6_hdr(skb);
 
        hdr_len = ip6_find_1stfragopt(skb, &prevhdr);
        skb->nh.raw = prevhdr - x->props.header_len;
-       skb->h.raw = skb->data + hdr_len;
+       skb_set_transport_header(skb, hdr_len);
        memmove(skb->data, iph, hdr_len);
 
-       skb->nh.raw = skb->data;
-       top_iph = skb->nh.ipv6h;
+       skb_reset_network_header(skb);
+       top_iph = ipv6_hdr(skb);
        skb->nh.raw = &top_iph->nexthdr;
        skb->h.ipv6h = top_iph + 1;
 
@@ -59,6 +59,7 @@ static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
 static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)
 {
        struct ipv6hdr *ip6h;
+       const unsigned char *old_mac;
        int size = sizeof(struct ipv6hdr);
        int err = -EINVAL;
 
@@ -66,13 +67,14 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)
                goto out;
 
        skb_push(skb, size);
-       memmove(skb->data, skb->nh.raw, size);
-       skb->nh.raw = skb->data;
+       memmove(skb->data, skb_network_header(skb), size);
+       skb_reset_network_header(skb);
 
-       skb->mac.raw = memmove(skb->data - skb->mac_len,
-                              skb->mac.raw, skb->mac_len);
+       old_mac = skb_mac_header(skb);
+       skb_set_mac_header(skb, -skb->mac_len);
+       memmove(skb_mac_header(skb), old_mac, skb->mac_len);
 
-       ip6h = skb->nh.ipv6h;
+       ip6h = ipv6_hdr(skb);
        ip6h->payload_len = htons(skb->len - size);
        ipv6_addr_copy(&ip6h->daddr, (struct in6_addr *) &x->sel.daddr.a6);
        ipv6_addr_copy(&ip6h->saddr, (struct in6_addr *) &x->sel.saddr.a6);