Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1fbed0e authored by Steffen Klassert's avatar Steffen Klassert
Browse files

esp6: Remame esp_input_done2 



We are going to export the ipv4 and the ipv6
version of esp_input_done2. They are not static
anymore and can't have the same name. So rename
the ipv6 version to esp6_input_done2.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent d77e38e6

net/ipv6/esp6.c

+3 −3
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) 
	return err;

}



static int esp_input_done2(struct sk_buff *skb, int err)

static int esp6_input_done2(struct sk_buff *skb, int err)

{

	struct xfrm_state *x = xfrm_input_state(skb);

	struct xfrm_offload *xo = xfrm_offload(skb);
@@ -499,7 +499,7 @@ static void esp_input_done(struct crypto_async_request *base, int err) 
{

	struct sk_buff *skb = base->data;



	xfrm_input_resume(skb, esp_input_done2(skb, err));

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

}



static void esp_input_restore_header(struct sk_buff *skb)
@@ -621,7 +621,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) 
	if ((x->props.flags & XFRM_STATE_ESN))

		esp_input_restore_header(skb);



	ret = esp_input_done2(skb, ret);

	ret = esp6_input_done2(skb, ret);



out:

	return ret;