diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-10 18:44:06 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:54 -0400 |
commit | 7b277b1a5fb147cb828e5d8b9780cee60f31a9bf (patch) | |
tree | 21af4818d7ba9d646a281517f476d81d4245cc30 /net/ipv6/esp6.c | |
parent | bee0b40c0621396326d1c17b81833f59118a2d80 (diff) |
[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/esp6.c')
-rw-r--r-- | net/ipv6/esp6.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 7355bb0345e2..21c93f026dbc 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -54,13 +54,8 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) | |||
54 | int nfrags; | 54 | int nfrags; |
55 | u8 *tail; | 55 | u8 *tail; |
56 | struct esp_data *esp = x->data; | 56 | struct esp_data *esp = x->data; |
57 | int hdr_len = (skb_transport_offset(skb) + | ||
58 | sizeof(*esph) + esp->conf.ivlen); | ||
59 | 57 | ||
60 | /* Strip IP+ESP header. */ | 58 | /* skb is pure payload to encrypt */ |
61 | __skb_pull(skb, hdr_len); | ||
62 | |||
63 | /* Now skb is pure payload to encrypt */ | ||
64 | err = -ENOMEM; | 59 | err = -ENOMEM; |
65 | 60 | ||
66 | /* Round to block size */ | 61 | /* Round to block size */ |
@@ -89,7 +84,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) | |||
89 | tail[clen-skb->len - 2] = (clen - skb->len) - 2; | 84 | tail[clen-skb->len - 2] = (clen - skb->len) - 2; |
90 | pskb_put(skb, trailer, clen - skb->len); | 85 | pskb_put(skb, trailer, clen - skb->len); |
91 | 86 | ||
92 | __skb_push(skb, -skb_network_offset(skb)); | 87 | skb_push(skb, -skb_network_offset(skb)); |
93 | top_iph = ipv6_hdr(skb); | 88 | top_iph = ipv6_hdr(skb); |
94 | esph = (struct ipv6_esp_hdr *)skb_transport_header(skb); | 89 | esph = (struct ipv6_esp_hdr *)skb_transport_header(skb); |
95 | top_iph->payload_len = htons(skb->len + alen - sizeof(*top_iph)); | 90 | top_iph->payload_len = htons(skb->len + alen - sizeof(*top_iph)); |