[IPSEC]: Set skb->data to payload in x->mode->output

[pandora-kernel.git] / net / ipv4 / xfrm4_mode_beet.c

diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c
index a73e710..77888f5 100644 (file)
--- a/net/ipv4/xfrm4_mode_beet.c
+++ b/net/ipv4/xfrm4_mode_beet.c
@@ -40,10 +40,11 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
        if (unlikely(optlen))
                hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4);
 
-       skb_push(skb, x->props.header_len - IPV4_BEET_PHMAXLEN + hdrlen);
-       skb_reset_network_header(skb);
+       skb_set_network_header(skb, IPV4_BEET_PHMAXLEN - x->props.header_len -
+                                   hdrlen);
        top_iph = ip_hdr(skb);
        skb->transport_header += sizeof(*iph) - hdrlen;
+       __skb_pull(skb, sizeof(*iph) - hdrlen);
 
        memmove(top_iph, iph, sizeof(*iph));
        if (unlikely(optlen)) {