summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ah4.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-13 17:06:52 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 07:25:15 +0200
commitbadff6d01a8589a1c828b0bf118903ca38627f4e (patch)
tree89611d7058c612085c58dfb9913ee30ddf04b604 /net/ipv4/ah4.c
parent[SK_BUFF]: Introduce ipv6_hdr(), remove skb->nh.ipv6h (diff)
downloadlinux-badff6d01a8589a1c828b0bf118903ca38627f4e.tar.xz
linux-badff6d01a8589a1c828b0bf118903ca38627f4e.zip
[SK_BUFF]: Introduce skb_reset_transport_header(skb)
For the common, open coded 'skb->h.raw = skb->data' operation, so that we can later turn skb->h.raw into a offset, reducing the size of struct sk_buff in 64bit land while possibly keeping it as a pointer on 32bit. This one touches just the most simple cases: skb->h.raw = skb->data; skb->h.raw = {skb_push|[__]skb_pull}() The next ones will handle the slightly more "complex" cases. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ah4.c')
-rw-r--r--net/ipv4/ah4.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 00fd31da252e..ebcc797e1c13 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -182,7 +182,8 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
}
((struct iphdr*)work_buf)->protocol = ah->nexthdr;
skb->nh.raw += ah_hlen;
- skb->h.raw = memcpy(skb_network_header(skb), work_buf, ihl);
+ memcpy(skb_network_header(skb), work_buf, ihl);
+ skb->h.raw = skb->nh.raw;
__skb_pull(skb, ah_hlen + ihl);
return 0;