Commit 6002e20d authored by Herbert Xu's avatar Herbert Xu
Browse files

net: ipv6: Remove completion function scaffolding 



This patch removes the temporary scaffolding now that the comletion
function signature has been converted.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fd5dabf7

net/ipv6/ah6.c

+4 −4
Original line number Diff line number Diff line
@@ -281,12 +281,12 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir) 
	return 0;

}



static void ah6_output_done(crypto_completion_data_t *data, int err)

static void ah6_output_done(void *data, int err)

{

	int extlen;

	u8 *iph_base;

	u8 *icv;

	struct sk_buff *skb = crypto_get_completion_data(data);

	struct sk_buff *skb = data;

	struct xfrm_state *x = skb_dst(skb)->xfrm;

	struct ah_data *ahp = x->data;

	struct ipv6hdr *top_iph = ipv6_hdr(skb);
@@ -451,12 +451,12 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) 
	return err;

}



static void ah6_input_done(crypto_completion_data_t *data, int err)

static void ah6_input_done(void *data, int err)

{

	u8 *auth_data;

	u8 *icv;

	u8 *work_iph;

	struct sk_buff *skb = crypto_get_completion_data(data);

	struct sk_buff *skb = data;

	struct xfrm_state *x = xfrm_input_state(skb);

	struct ah_data *ahp = x->data;

	struct ip_auth_hdr *ah = ip_auth_hdr(skb);

net/ipv6/esp6.c

+8 −8
Original line number Diff line number Diff line
@@ -278,9 +278,9 @@ static void esp_output_encap_csum(struct sk_buff *skb) 
	}

}



static void esp_output_done(crypto_completion_data_t *data, int err)

static void esp_output_done(void *data, int err)

{

	struct sk_buff *skb = crypto_get_completion_data(data);

	struct sk_buff *skb = data;

	struct xfrm_offload *xo = xfrm_offload(skb);

	void *tmp;

	struct xfrm_state *x;
@@ -368,9 +368,9 @@ static struct ip_esp_hdr *esp_output_set_esn(struct sk_buff *skb, 
	return esph;

}



static void esp_output_done_esn(crypto_completion_data_t *data, int err)

static void esp_output_done_esn(void *data, int err)

{

	struct sk_buff *skb = crypto_get_completion_data(data);

	struct sk_buff *skb = data;



	esp_output_restore_header(skb);

	esp_output_done(data, err);
@@ -879,9 +879,9 @@ int esp6_input_done2(struct sk_buff *skb, int err) 
}

EXPORT_SYMBOL_GPL(esp6_input_done2);



static void esp_input_done(crypto_completion_data_t *data, int err)

static void esp_input_done(void *data, int err)

{

	struct sk_buff *skb = crypto_get_completion_data(data);

	struct sk_buff *skb = data;



	xfrm_input_resume(skb, esp6_input_done2(skb, err));

}
@@ -909,9 +909,9 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi) 
	}

}



static void esp_input_done_esn(crypto_completion_data_t *data, int err)

static void esp_input_done_esn(void *data, int err)

{

	struct sk_buff *skb = crypto_get_completion_data(data);

	struct sk_buff *skb = data;



	esp_input_restore_header(skb);

	esp_input_done(data, err);