Merge branches 'release' and 'wmi-2.6.25' into release

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

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 1a5c45b968520a9786f6da391c341a74751a081d..074298f2f8e392ef56391db7c2029fe07d1489c2 100644 (file)
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -243,6 +243,8 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
        inst->alg.cra_ablkcipher.min_keysize = alg->cra_blkcipher.min_keysize;
        inst->alg.cra_ablkcipher.max_keysize = alg->cra_blkcipher.max_keysize;
 
+       inst->alg.cra_ablkcipher.geniv = alg->cra_blkcipher.geniv;
+
        inst->alg.cra_ctxsize = sizeof(struct cryptd_blkcipher_ctx);
 
        inst->alg.cra_init = cryptd_blkcipher_init_tfm;