Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Herbert Xu <herbert@gondor.apana.org.au>
+14
-14
+4
-4
net/ipv6/ah6.c
+4
-4
net/ipv6/ah6.c
···
281
281
return 0;
282
282
}
283
283
284
-
static void ah6_output_done(struct crypto_async_request *base, int err)
284
+
static void ah6_output_done(crypto_completion_data_t *data, int err)
285
285
{
286
286
int extlen;
287
287
u8 *iph_base;
288
288
u8 *icv;
289
-
struct sk_buff *skb = base->data;
289
+
struct sk_buff *skb = crypto_get_completion_data(data);
290
290
struct xfrm_state *x = skb_dst(skb)->xfrm;
291
291
struct ah_data *ahp = x->data;
292
292
struct ipv6hdr *top_iph = ipv6_hdr(skb);
···
451
451
return err;
452
452
}
453
453
454
-
static void ah6_input_done(struct crypto_async_request *base, int err)
454
+
static void ah6_input_done(crypto_completion_data_t *data, int err)
455
455
{
456
456
u8 *auth_data;
457
457
u8 *icv;
458
458
u8 *work_iph;
459
-
struct sk_buff *skb = base->data;
459
+
struct sk_buff *skb = crypto_get_completion_data(data);
460
460
struct xfrm_state *x = xfrm_input_state(skb);
461
461
struct ah_data *ahp = x->data;
462
462
struct ip_auth_hdr *ah = ip_auth_hdr(skb);
+10
-10
net/ipv6/esp6.c
+10
-10
net/ipv6/esp6.c
···
278
278
}
279
279
}
280
280
281
-
static void esp_output_done(struct crypto_async_request *base, int err)
281
+
static void esp_output_done(crypto_completion_data_t *data, int err)
282
282
{
283
-
struct sk_buff *skb = base->data;
283
+
struct sk_buff *skb = crypto_get_completion_data(data);
284
284
struct xfrm_offload *xo = xfrm_offload(skb);
285
285
void *tmp;
286
286
struct xfrm_state *x;
···
368
368
return esph;
369
369
}
370
370
371
-
static void esp_output_done_esn(struct crypto_async_request *base, int err)
371
+
static void esp_output_done_esn(crypto_completion_data_t *data, int err)
372
372
{
373
-
struct sk_buff *skb = base->data;
373
+
struct sk_buff *skb = crypto_get_completion_data(data);
374
374
375
375
esp_output_restore_header(skb);
376
-
esp_output_done(base, err);
376
+
esp_output_done(data, err);
377
377
}
378
378
379
379
static struct ip_esp_hdr *esp6_output_udp_encap(struct sk_buff *skb,
···
879
879
}
880
880
EXPORT_SYMBOL_GPL(esp6_input_done2);
881
881
882
-
static void esp_input_done(struct crypto_async_request *base, int err)
882
+
static void esp_input_done(crypto_completion_data_t *data, int err)
883
883
{
884
-
struct sk_buff *skb = base->data;
884
+
struct sk_buff *skb = crypto_get_completion_data(data);
885
885
886
886
xfrm_input_resume(skb, esp6_input_done2(skb, err));
887
887
}
···
909
909
}
910
910
}
911
911
912
-
static void esp_input_done_esn(struct crypto_async_request *base, int err)
912
+
static void esp_input_done_esn(crypto_completion_data_t *data, int err)
913
913
{
914
-
struct sk_buff *skb = base->data;
914
+
struct sk_buff *skb = crypto_get_completion_data(data);
915
915
916
916
esp_input_restore_header(skb);
917
-
esp_input_done(base, err);
917
+
esp_input_done(data, err);
918
918
}
919
919
920
920
static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)