Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/crypto/essiv.c b/crypto/essiv.c
index 20d7c1fdbf5d5b276ef5cccb35dbe2fb18ffbace..465a89c9d1effe3b7071a003696df6ef368d96a3 100644 (file)
--- a/crypto/essiv.c
+++ b/crypto/essiv.c
@@ -331,7 +331,7 @@ static int essiv_aead_init_tfm(struct crypto_aead *tfm)
        if (IS_ERR(aead))
                return PTR_ERR(aead);
 
-       subreq_size = FIELD_SIZEOF(struct essiv_aead_request_ctx, aead_req) +
+       subreq_size = sizeof_field(struct essiv_aead_request_ctx, aead_req) +
                      crypto_aead_reqsize(aead);
 
        tctx->ivoffset = offsetof(struct essiv_aead_request_ctx, aead_req) +