Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6] / net / ipv4 / xfrm4_mode_beet.c

diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c
index 32fcfc0b5c8c10d6a5a8e9a954b33592523c8601..a73e710740c22396c4bff28337c53ea6b8624565 100644 (file)
--- a/net/ipv4/xfrm4_mode_beet.c
+++ b/net/ipv4/xfrm4_mode_beet.c
@@ -29,21 +29,21 @@
  */
 static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
 {
-       struct iphdr *iph, *top_iph = NULL;
+       struct iphdr *iph, *top_iph;
        int hdrlen, optlen;
 
        iph = ip_hdr(skb);
-       skb->h.raw = skb->nh.raw;
+       skb->transport_header = skb->network_header;
 
        hdrlen = 0;
        optlen = iph->ihl * 4 - sizeof(*iph);
        if (unlikely(optlen))
                hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4);
 
-       skb_push(skb, x->props.header_len + hdrlen);
+       skb_push(skb, x->props.header_len - IPV4_BEET_PHMAXLEN + hdrlen);
        skb_reset_network_header(skb);
        top_iph = ip_hdr(skb);
-       skb->h.raw += sizeof(*iph) - hdrlen;
+       skb->transport_header += sizeof(*iph) - hdrlen;
 
        memmove(top_iph, iph, sizeof(*iph));
        if (unlikely(optlen)) {
@@ -51,7 +51,7 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
 
                BUG_ON(optlen < 0);
 
-               ph = (struct ip_beet_phdr *)skb->h.raw;
+               ph = (struct ip_beet_phdr *)skb_transport_header(skb);
                ph->padlen = 4 - (optlen & 4);
                ph->hdrlen = optlen / 8;
                ph->nexthdr = top_iph->protocol;
@@ -73,11 +73,9 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)
        struct iphdr *iph = ip_hdr(skb);
        int phlen = 0;
        int optlen = 0;
-       __u8 ph_nexthdr = 0, protocol = 0;
+       u8 ph_nexthdr = 0;
        int err = -EINVAL;
 
-       protocol = iph->protocol;
-
        if (unlikely(iph->protocol == IPPROTO_BEETPH)) {
                struct ip_beet_phdr *ph;
 
@@ -100,7 +98,7 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)
        skb_set_network_header(skb, phlen - sizeof(*iph));
        memmove(skb_network_header(skb), iph, sizeof(*iph));
        skb_set_transport_header(skb, phlen + optlen);
-       skb->data = skb->h.raw;
+       skb->data = skb_transport_header(skb);
 
        iph = ip_hdr(skb);
        iph->ihl = (sizeof(*iph) + optlen) / 4;
@@ -109,8 +107,6 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)
        iph->saddr = x->sel.saddr.a4;
        if (ph_nexthdr)
                iph->protocol = ph_nexthdr;
-       else
-               iph->protocol = protocol;
        iph->check = 0;
        iph->check = ip_fast_csum(skb_network_header(skb), iph->ihl);
        err = 0;