[SK_BUFF]: Introduce skb_network_header()

[net-next-2.6.git] / net / ipv6 / xfrm6_mode_transport.c

diff --git a/net/ipv6/xfrm6_mode_transport.c b/net/ipv6/xfrm6_mode_transport.c
index 3a4b39b12bad016c943ebb0e337b139032db3f60..ace0bbf4f25d6e63f67bdcb521e650ac99b75f02 100644 (file)
--- a/net/ipv6/xfrm6_mode_transport.c
+++ b/net/ipv6/xfrm6_mode_transport.c
@@ -53,8 +53,10 @@ static int xfrm6_transport_input(struct xfrm_state *x, struct sk_buff *skb)
 {
        int ihl = skb->data - skb->h.raw;
 
-       if (skb->h.raw != skb->nh.raw)
-               skb->nh.raw = memmove(skb->h.raw, skb->nh.raw, ihl);
+       if (skb->h.raw != skb->nh.raw) {
+               memmove(skb->h.raw, skb_network_header(skb), ihl);
+               skb->nh.raw = skb->h.raw;
+       }
        skb->nh.ipv6h->payload_len = htons(skb->len + ihl -
                                           sizeof(struct ipv6hdr));
        skb->h.raw = skb->data;