Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net: ipv4: 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/ipv4/ah4.c
+4
-4
net/ipv4/ah4.c
···
117
117
return 0;
118
118
}
119
119
120
-
static void ah_output_done(struct crypto_async_request *base, int err)
120
+
static void ah_output_done(crypto_completion_data_t *data, int err)
121
121
{
122
122
u8 *icv;
123
123
struct iphdr *iph;
124
-
struct sk_buff *skb = base->data;
124
+
struct sk_buff *skb = crypto_get_completion_data(data);
125
125
struct xfrm_state *x = skb_dst(skb)->xfrm;
126
126
struct ah_data *ahp = x->data;
127
127
struct iphdr *top_iph = ip_hdr(skb);
···
262
262
return err;
263
263
}
264
264
265
-
static void ah_input_done(struct crypto_async_request *base, int err)
265
+
static void ah_input_done(crypto_completion_data_t *data, int err)
266
266
{
267
267
u8 *auth_data;
268
268
u8 *icv;
269
269
struct iphdr *work_iph;
270
-
struct sk_buff *skb = base->data;
270
+
struct sk_buff *skb = crypto_get_completion_data(data);
271
271
struct xfrm_state *x = xfrm_input_state(skb);
272
272
struct ah_data *ahp = x->data;
273
273
struct ip_auth_hdr *ah = ip_auth_hdr(skb);
+10
-10
net/ipv4/esp4.c
+10
-10
net/ipv4/esp4.c
···
244
244
}
245
245
#endif
246
246
247
-
static void esp_output_done(struct crypto_async_request *base, int err)
247
+
static void esp_output_done(crypto_completion_data_t *data, int err)
248
248
{
249
-
struct sk_buff *skb = base->data;
249
+
struct sk_buff *skb = crypto_get_completion_data(data);
250
250
struct xfrm_offload *xo = xfrm_offload(skb);
251
251
void *tmp;
252
252
struct xfrm_state *x;
···
332
332
return esph;
333
333
}
334
334
335
-
static void esp_output_done_esn(struct crypto_async_request *base, int err)
335
+
static void esp_output_done_esn(crypto_completion_data_t *data, int err)
336
336
{
337
-
struct sk_buff *skb = base->data;
337
+
struct sk_buff *skb = crypto_get_completion_data(data);
338
338
339
339
esp_output_restore_header(skb);
340
-
esp_output_done(base, err);
340
+
esp_output_done(data, err);
341
341
}
342
342
343
343
static struct ip_esp_hdr *esp_output_udp_encap(struct sk_buff *skb,
···
830
830
}
831
831
EXPORT_SYMBOL_GPL(esp_input_done2);
832
832
833
-
static void esp_input_done(struct crypto_async_request *base, int err)
833
+
static void esp_input_done(crypto_completion_data_t *data, int err)
834
834
{
835
-
struct sk_buff *skb = base->data;
835
+
struct sk_buff *skb = crypto_get_completion_data(data);
836
836
837
837
xfrm_input_resume(skb, esp_input_done2(skb, err));
838
838
}
···
860
860
}
861
861
}
862
862
863
-
static void esp_input_done_esn(struct crypto_async_request *base, int err)
863
+
static void esp_input_done_esn(crypto_completion_data_t *data, int err)
864
864
{
865
-
struct sk_buff *skb = base->data;
865
+
struct sk_buff *skb = crypto_get_completion_data(data);
866
866
867
867
esp_input_restore_header(skb);
868
-
esp_input_done(base, err);
868
+
esp_input_done(data, err);
869
869
}
870
870
871
871
/*