Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / mv_cesa.c

diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index 8d1e6f8e9e9cf613519b14fa5e5126135d37e986..29d0ee5049070c114696820c95d1b2daa3aef732 100644 (file)
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -622,8 +622,8 @@ static int queue_manag(void *data)
                }
 
                if (async_req) {
-                       if (async_req->tfm->__crt_alg->cra_type !=
-                           &crypto_ahash_type) {
+                       if (crypto_tfm_alg_type(async_req->tfm) !=
+                           CRYPTO_ALG_TYPE_AHASH) {
                                struct ablkcipher_request *req =
                                    ablkcipher_request_cast(async_req);
                                mv_start_new_crypt_req(req);
@@ -843,7 +843,7 @@ static int mv_hash_setkey(struct crypto_ahash *tfm, const u8 * key,
 static int mv_cra_hash_init(struct crypto_tfm *tfm, const char *base_hash_name,
                            enum hash_op op, int count_add)
 {
-       const char *fallback_driver_name = tfm->__crt_alg->cra_name;
+       const char *fallback_driver_name = crypto_tfm_alg_name(tfm);
        struct mv_tfm_hash_ctx *ctx = crypto_tfm_ctx(tfm);
        struct crypto_shash *fallback_tfm = NULL;
        struct crypto_shash *base_hash = NULL;