Commit ec2964e8 authored by Herbert Xu's avatar Herbert Xu

net: ipv6: Add scaffolding to change completion function signature

This patch adds temporary scaffolding so that the Crypto API
completion function can take a void * instead of crypto_async_request.
Once affected users have been converted this can be removed.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 14d3109c
...@@ -281,12 +281,12 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir) ...@@ -281,12 +281,12 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir)
return 0; return 0;
} }
static void ah6_output_done(struct crypto_async_request *base, int err) static void ah6_output_done(crypto_completion_data_t *data, int err)
{ {
int extlen; int extlen;
u8 *iph_base; u8 *iph_base;
u8 *icv; u8 *icv;
struct sk_buff *skb = base->data; struct sk_buff *skb = crypto_get_completion_data(data);
struct xfrm_state *x = skb_dst(skb)->xfrm; struct xfrm_state *x = skb_dst(skb)->xfrm;
struct ah_data *ahp = x->data; struct ah_data *ahp = x->data;
struct ipv6hdr *top_iph = ipv6_hdr(skb); struct ipv6hdr *top_iph = ipv6_hdr(skb);
...@@ -451,12 +451,12 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) ...@@ -451,12 +451,12 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
return err; return err;
} }
static void ah6_input_done(struct crypto_async_request *base, int err) static void ah6_input_done(crypto_completion_data_t *data, int err)
{ {
u8 *auth_data; u8 *auth_data;
u8 *icv; u8 *icv;
u8 *work_iph; u8 *work_iph;
struct sk_buff *skb = base->data; struct sk_buff *skb = crypto_get_completion_data(data);
struct xfrm_state *x = xfrm_input_state(skb); struct xfrm_state *x = xfrm_input_state(skb);
struct ah_data *ahp = x->data; struct ah_data *ahp = x->data;
struct ip_auth_hdr *ah = ip_auth_hdr(skb); struct ip_auth_hdr *ah = ip_auth_hdr(skb);
......
...@@ -278,9 +278,9 @@ static void esp_output_encap_csum(struct sk_buff *skb) ...@@ -278,9 +278,9 @@ static void esp_output_encap_csum(struct sk_buff *skb)
} }
} }
static void esp_output_done(struct crypto_async_request *base, int err) static void esp_output_done(crypto_completion_data_t *data, int err)
{ {
struct sk_buff *skb = base->data; struct sk_buff *skb = crypto_get_completion_data(data);
struct xfrm_offload *xo = xfrm_offload(skb); struct xfrm_offload *xo = xfrm_offload(skb);
void *tmp; void *tmp;
struct xfrm_state *x; struct xfrm_state *x;
...@@ -368,12 +368,12 @@ static struct ip_esp_hdr *esp_output_set_esn(struct sk_buff *skb, ...@@ -368,12 +368,12 @@ static struct ip_esp_hdr *esp_output_set_esn(struct sk_buff *skb,
return esph; return esph;
} }
static void esp_output_done_esn(struct crypto_async_request *base, int err) static void esp_output_done_esn(crypto_completion_data_t *data, int err)
{ {
struct sk_buff *skb = base->data; struct sk_buff *skb = crypto_get_completion_data(data);
esp_output_restore_header(skb); esp_output_restore_header(skb);
esp_output_done(base, err); esp_output_done(data, err);
} }
static struct ip_esp_hdr *esp6_output_udp_encap(struct sk_buff *skb, static struct ip_esp_hdr *esp6_output_udp_encap(struct sk_buff *skb,
...@@ -879,9 +879,9 @@ int esp6_input_done2(struct sk_buff *skb, int err) ...@@ -879,9 +879,9 @@ int esp6_input_done2(struct sk_buff *skb, int err)
} }
EXPORT_SYMBOL_GPL(esp6_input_done2); EXPORT_SYMBOL_GPL(esp6_input_done2);
static void esp_input_done(struct crypto_async_request *base, int err) static void esp_input_done(crypto_completion_data_t *data, int err)
{ {
struct sk_buff *skb = base->data; struct sk_buff *skb = crypto_get_completion_data(data);
xfrm_input_resume(skb, esp6_input_done2(skb, err)); xfrm_input_resume(skb, esp6_input_done2(skb, err));
} }
...@@ -909,12 +909,12 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi) ...@@ -909,12 +909,12 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)
} }
} }
static void esp_input_done_esn(struct crypto_async_request *base, int err) static void esp_input_done_esn(crypto_completion_data_t *data, int err)
{ {
struct sk_buff *skb = base->data; struct sk_buff *skb = crypto_get_completion_data(data);
esp_input_restore_header(skb); esp_input_restore_header(skb);
esp_input_done(base, err); esp_input_done(data, err);
} }
static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment