[dm-devel] [PATCH 13/17] net: ipv4: Remove completion function scaffolding

[Herbert Xu]

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

Signed-off-by: Herbert Xu <herb...@gondor.apana.org.au>
---

 net/ipv4/ah4.c  |    8 ++++----
 net/ipv4/esp4.c |   16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 1fc0231eb1ee..015c0f4ec5ba 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -117,11 +117,11 @@ static int ip_clear_mutable_options(const struct iphdr 
*iph, __be32 *daddr)
        return 0;
 }
 
-static void ah_output_done(crypto_completion_data_t *data, int err)
+static void ah_output_done(void *data, int err)
 {
        u8 *icv;
        struct iphdr *iph;
-       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 iphdr *top_iph = ip_hdr(skb);
@@ -262,12 +262,12 @@ static int ah_output(struct xfrm_state *x, struct sk_buff 
*skb)
        return err;
 }
 
-static void ah_input_done(crypto_completion_data_t *data, int err)
+static void ah_input_done(void *data, int err)
 {
        u8 *auth_data;
        u8 *icv;
        struct iphdr *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);
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 8abe07c1ff28..ba06ed42e428 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -244,9 +244,9 @@ static int esp_output_tail_tcp(struct xfrm_state *x, struct 
sk_buff *skb)
 }
 #endif
 
-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;
@@ -332,9 +332,9 @@ static struct ip_esp_hdr *esp_output_set_extra(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);
@@ -830,9 +830,9 @@ int esp_input_done2(struct sk_buff *skb, int err)
 }
 EXPORT_SYMBOL_GPL(esp_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, esp_input_done2(skb, err));
 }
@@ -860,9 +860,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);
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel