Merge tag 's390-5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / crypto / echainiv.c

diff --git a/crypto/echainiv.c b/crypto/echainiv.c
index 45819e6015bf408c927f940024f22661bdbc7e06..77e607fdbfb73e19ae6ae54ec6ad06df7e8e1c44 100644 (file)
--- a/crypto/echainiv.c
+++ b/crypto/echainiv.c
@@ -47,9 +47,9 @@ static int echainiv_encrypt(struct aead_request *req)
        info = req->iv;
 
        if (req->src != req->dst) {
-               SKCIPHER_REQUEST_ON_STACK(nreq, ctx->sknull);
+               SYNC_SKCIPHER_REQUEST_ON_STACK(nreq, ctx->sknull);
 
-               skcipher_request_set_tfm(nreq, ctx->sknull);
+               skcipher_request_set_sync_tfm(nreq, ctx->sknull);
                skcipher_request_set_callback(nreq, req->base.flags,
                                              NULL, NULL);
                skcipher_request_set_crypt(nreq, req->src, req->dst,