Skip to content

Commit fd5dabf

Browse files
committed
net: ipv4: 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 23b8b93 commit fd5dabf

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

net/ipv4/ah4.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr)
117117
return 0;
118118
}
119119

120-
static void ah_output_done(crypto_completion_data_t *data, int err)
120+
static void ah_output_done(void *data, int err)
121121
{
122122
u8 *icv;
123123
struct iphdr *iph;
124-
struct sk_buff *skb = crypto_get_completion_data(data);
124+
struct sk_buff *skb = data;
125125
struct xfrm_state *x = skb_dst(skb)->xfrm;
126126
struct ah_data *ahp = x->data;
127127
struct iphdr *top_iph = ip_hdr(skb);
@@ -262,12 +262,12 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
262262
return err;
263263
}
264264

265-
static void ah_input_done(crypto_completion_data_t *data, int err)
265+
static void ah_input_done(void *data, int err)
266266
{
267267
u8 *auth_data;
268268
u8 *icv;
269269
struct iphdr *work_iph;
270-
struct sk_buff *skb = crypto_get_completion_data(data);
270+
struct sk_buff *skb = data;
271271
struct xfrm_state *x = xfrm_input_state(skb);
272272
struct ah_data *ahp = x->data;
273273
struct ip_auth_hdr *ah = ip_auth_hdr(skb);

net/ipv4/esp4.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ static int esp_output_tail_tcp(struct xfrm_state *x, struct sk_buff *skb)
244244
}
245245
#endif
246246

247-
static void esp_output_done(crypto_completion_data_t *data, int err)
247+
static void esp_output_done(void *data, int err)
248248
{
249-
struct sk_buff *skb = crypto_get_completion_data(data);
249+
struct sk_buff *skb = data;
250250
struct xfrm_offload *xo = xfrm_offload(skb);
251251
void *tmp;
252252
struct xfrm_state *x;
@@ -332,9 +332,9 @@ static struct ip_esp_hdr *esp_output_set_extra(struct sk_buff *skb,
332332
return esph;
333333
}
334334

335-
static void esp_output_done_esn(crypto_completion_data_t *data, int err)
335+
static void esp_output_done_esn(void *data, int err)
336336
{
337-
struct sk_buff *skb = crypto_get_completion_data(data);
337+
struct sk_buff *skb = data;
338338

339339
esp_output_restore_header(skb);
340340
esp_output_done(data, err);
@@ -830,9 +830,9 @@ int esp_input_done2(struct sk_buff *skb, int err)
830830
}
831831
EXPORT_SYMBOL_GPL(esp_input_done2);
832832

833-
static void esp_input_done(crypto_completion_data_t *data, int err)
833+
static void esp_input_done(void *data, int err)
834834
{
835-
struct sk_buff *skb = crypto_get_completion_data(data);
835+
struct sk_buff *skb = data;
836836

837837
xfrm_input_resume(skb, esp_input_done2(skb, err));
838838
}
@@ -860,9 +860,9 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi)
860860
}
861861
}
862862

863-
static void esp_input_done_esn(crypto_completion_data_t *data, int err)
863+
static void esp_input_done_esn(void *data, int err)
864864
{
865-
struct sk_buff *skb = crypto_get_completion_data(data);
865+
struct sk_buff *skb = data;
866866

867867
esp_input_restore_header(skb);
868868
esp_input_done(data, err);

0 commit comments

Comments
 (0)