2.6.25-rc7

 crypto

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 8bf2da8..2504252 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -228,21 +228,23 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
    struct crypto_alg *alg;
 
    alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER,
-              CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
+              CRYPTO_ALG_TYPE_MASK);
    if (IS_ERR(alg))
-      return ERR_PTR(PTR_ERR(alg));
+      return ERR_CAST(alg);
 
    inst = cryptd_alloc_instance(alg, state);
    if (IS_ERR(inst))
       goto out_put_alg;
 
-   inst->alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_ASYNC;
+   inst->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;
    inst->alg.cra_type = &crypto_ablkcipher_type;
 
    inst->alg.cra_ablkcipher.ivsize = alg->cra_blkcipher.ivsize;
    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;
@@ -265,7 +267,7 @@ static struct crypto_instance *cryptd_alloc(struct rtattr **tb)
 
    algt = crypto_get_attr_type(tb);
    if (IS_ERR(algt))
-      return ERR_PTR(PTR_ERR(algt));
+      return ERR_CAST(algt);
 
    switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
    case CRYPTO_ALG_TYPE_BLKCIPHER: