Browse Source

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: Steffen Klassert <steffen.klassert@secunet.com>
Steffen Klassert 8 years ago
parent
commit
f1fbed0e89
1 changed files with 3 additions and 3 deletions
  1. 3 3
      net/ipv6/esp6.c

+ 3 - 3
net/ipv6/esp6.c

@@ -447,7 +447,7 @@ error:
 	return err;
 	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_state *x = xfrm_input_state(skb);
 	struct xfrm_offload *xo = xfrm_offload(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;
 	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)
 static void esp_input_restore_header(struct sk_buff *skb)
@@ -621,7 +621,7 @@ skip_cow:
 	if ((x->props.flags & XFRM_STATE_ESN))
 	if ((x->props.flags & XFRM_STATE_ESN))
 		esp_input_restore_header(skb);
 		esp_input_restore_header(skb);
 
 
-	ret = esp_input_done2(skb, ret);
+	ret = esp6_input_done2(skb, ret);
 
 
 out:
 out:
 	return ret;
 	return ret;