userfaultfd: waitqueue: add nr wake parameter to __wake_up_locked_key

[pandora-kernel.git] / crypto / authenc.c

diff --git a/crypto/authenc.c b/crypto/authenc.c
index bca3835..55a354d 100644 (file)
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -393,8 +393,7 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
        if (IS_ERR(algt))
                return PTR_ERR(algt);
 
-       if ((algt->type ^ (CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_AEAD_NEW)) &
-           algt->mask)
+       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                return -EINVAL;
 
        auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,
@@ -445,7 +444,6 @@ static int crypto_authenc_create(struct crypto_template *tmpl,
                goto err_drop_enc;
 
        inst->alg.base.cra_flags = enc->cra_flags & CRYPTO_ALG_ASYNC;
-       inst->alg.base.cra_flags |= CRYPTO_ALG_AEAD_NEW;
        inst->alg.base.cra_priority = enc->cra_priority * 10 +
                                      auth_base->cra_priority;
        inst->alg.base.cra_blocksize = enc->cra_blocksize;