summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ipcomp6.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-10-10 15:44:06 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:55:54 -0700
commit7b277b1a5fb147cb828e5d8b9780cee60f31a9bf (patch)
tree21af4818d7ba9d646a281517f476d81d4245cc30 /net/ipv6/ipcomp6.c
parentbee0b40c0621396326d1c17b81833f59118a2d80 (diff)
downloadop-kernel-dev-7b277b1a5fb147cb828e5d8b9780cee60f31a9bf.zip
op-kernel-dev-7b277b1a5fb147cb828e5d8b9780cee60f31a9bf.tar.gz
[IPSEC]: Set skb->data to payload in x->mode->output
This patch changes the calling convention so that on entry from x->mode->output and before entry into x->type->output skb->data will point to the payload instead of the IP header. This is essentially a redistribution of skb_push/skb_pull calls with the aim of minimising them on the common path of tunnel + ESP. It'll also let us use the same calling convention between IPv4 and IPv6 with the next patch. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ipcomp6.c')
-rw-r--r--net/ipv6/ipcomp6.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 71a14c0..87e6407 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -128,7 +128,10 @@ static int ipcomp6_output(struct xfrm_state *x, struct sk_buff *skb)
u8 *start, *scratch;
struct crypto_comp *tfm;
int cpu;
- int hdr_len = skb_transport_offset(skb);
+ int hdr_len;
+
+ skb_push(skb, -skb_network_offset(skb));
+ hdr_len = skb_transport_offset(skb);
/* check whether datagram len is larger than threshold */
if ((skb->len - hdr_len) < ipcd->threshold) {
OpenPOWER on IntegriCloud