Skip to content

Commit 6002e20

Browse files
committed
net: ipv6: Remove completion function scaffolding
This patch removes the temporary scaffolding now that the comletion function signature has been converted. Signed-off-by: Herbert Xu <[email protected]>
1 parent fd5dabf commit 6002e20

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

net/ipv6/ah6.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,12 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir)
281281
return 0;
282282
}
283283

284-
static void ah6_output_done(crypto_completion_data_t *data, int err)
284+
static void ah6_output_done(void *data, int err)
285285
{
286286
int extlen;
287287
u8 *iph_base;
288288
u8 *icv;
289-
struct sk_buff *skb = crypto_get_completion_data(data);
289+
struct sk_buff *skb = data;
290290
struct xfrm_state *x = skb_dst(skb)->xfrm;
291291
struct ah_data *ahp = x->data;
292292
struct ipv6hdr *top_iph = ipv6_hdr(skb);
@@ -451,12 +451,12 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
451451
return err;
452452
}
453453

454-
static void ah6_input_done(crypto_completion_data_t *data, int err)
454+
static void ah6_input_done(void *data, int err)
455455
{
456456
u8 *auth_data;
457457
u8 *icv;
458458
u8 *work_iph;
459-
struct sk_buff *skb = crypto_get_completion_data(data);
459+
struct sk_buff *skb = data;
460460
struct xfrm_state *x = xfrm_input_state(skb);
461461
struct ah_data *ahp = x->data;
462462
struct ip_auth_hdr *ah = ip_auth_hdr(skb);

net/ipv6/esp6.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@ static void esp_output_encap_csum(struct sk_buff *skb)
278278
}
279279
}
280280

281-
static void esp_output_done(crypto_completion_data_t *data, int err)
281+
static void esp_output_done(void *data, int err)
282282
{
283-
struct sk_buff *skb = crypto_get_completion_data(data);
283+
struct sk_buff *skb = data;
284284
struct xfrm_offload *xo = xfrm_offload(skb);
285285
void *tmp;
286286
struct xfrm_state *x;
@@ -368,9 +368,9 @@ static struct ip_esp_hdr *esp_output_set_esn(struct sk_buff *skb,
368368
return esph;
369369
}
370370

371-
static void esp_output_done_esn(crypto_completion_data_t *data, int err)
371+
static void esp_output_done_esn(void *data, int err)
372372
{
373-
struct sk_buff *skb = crypto_get_completion_data(data);
373+
struct sk_buff *skb = data;
374374

375375
esp_output_restore_header(skb);
376376
esp_output_done(data, err);
@@ -879,9 +879,9 @@ int esp6_input_done2(struct sk_buff *skb, int err)
879879
}
880880
EXPORT_SYMBOL_GPL(esp6_input_done2);
881881

882-
static void esp_input_done(crypto_completion_data_t *data, int err)
882+
static void esp_input_done(void *data, int err)
883883
{
884-
struct sk_buff *skb = crypto_get_completion_data(data);
884+
struct sk_buff *skb = data;
885885

886886
xfrm_input_resume(skb, esp6_input_done2(skb, err));
887887
}
@@ -909,9 +909,9 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)
909909
}
910910
}
911911

912-
static void esp_input_done_esn(crypto_completion_data_t *data, int err)
912+
static void esp_input_done_esn(void *data, int err)
913913
{
914-
struct sk_buff *skb = crypto_get_completion_data(data);
914+
struct sk_buff *skb = data;
915915

916916
esp_input_restore_header(skb);
917917
esp_input_done(data, err);

0 commit comments

Comments
 (0)