From 57b5544de80db85c8955499831fdaa30829db77a Mon Sep 17 00:00:00 2001 From: Cosmin Paraschiv Date: Thu, 23 Jan 2014 03:40:00 +0100 Subject: [PATCH] In the 3.13-rc1 Linux kernel, the INIT_COMPLETION macro has been replaced with an inline function, reinit_completion [1][2]. We are currently using the 3.13-rc3 Linux kernel, which leads to the following error: cryptlib.c:279:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration] INIT_COMPLETION(cdata->async.result->completion); [1] https://github.com/torvalds/linux/commit/c32f74ab2872994bc8336ed367313da3139350ca [2] https://github.com/torvalds/linux/commit/62026aedaacedbe1ffe94a3599ad4acd8ecdf587 Signed-off-by: Cosmin Paraschiv Reviewed-by: Cristian Stoica Tested-by: Cristian Stoica Signed-off-by: Horia Geanta Signed-off-by: Phil Sutter Upstream-Status: Backport --- cryptlib.c | 8 ++++---- cryptodev_int.h | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cryptlib.c b/cryptlib.c index 54d5d41..a923c14 100644 --- a/cryptlib.c +++ b/cryptlib.c @@ -217,7 +217,7 @@ ssize_t cryptodev_cipher_encrypt(struct cipher_data *cdata, { int ret; - INIT_COMPLETION(cdata->async.result->completion); + reinit_completion(&cdata->async.result->completion); if (cdata->aead == 0) { ablkcipher_request_set_crypt(cdata->async.request, @@ -240,7 +240,7 @@ ssize_t cryptodev_cipher_decrypt(struct cipher_data *cdata, { int ret; - INIT_COMPLETION(cdata->async.result->completion); + reinit_completion(&cdata->async.result->completion); if (cdata->aead == 0) { ablkcipher_request_set_crypt(cdata->async.request, (struct scatterlist *)src, dst, @@ -351,7 +351,7 @@ ssize_t cryptodev_hash_update(struct hash_data *hdata, { int ret; - INIT_COMPLETION(hdata->async.result->completion); + reinit_completion(&hdata->async.result->completion); ahash_request_set_crypt(hdata->async.request, sg, NULL, len); ret = crypto_ahash_update(hdata->async.request); @@ -363,7 +363,7 @@ int cryptodev_hash_final(struct hash_data *hdata, void* output) { int ret; - INIT_COMPLETION(hdata->async.result->completion); + reinit_completion(&hdata->async.result->completion); ahash_request_set_crypt(hdata->async.request, NULL, output, 0); ret = crypto_ahash_final(hdata->async.request); diff --git a/cryptodev_int.h b/cryptodev_int.h index 12dd5b1..188063d 100644 --- a/cryptodev_int.h +++ b/cryptodev_int.h @@ -2,6 +2,12 @@ #ifndef CRYPTODEV_INT_H # define CRYPTODEV_INT_H +#include + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)) +# define reinit_completion(x) INIT_COMPLETION(*(x)) +#endif + #include #include #include -- 1.9.1