Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / drivers / crypto / mv_cesa.c

diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index 0d40cf66b3cc55111182515fd4d695101d200fa0..e6ecc5f2394387efcdfa3b112edd83ac88591509 100644 (file)
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -899,7 +899,8 @@ struct crypto_alg mv_aes_alg_ecb = {
        .cra_name               = "ecb(aes)",
        .cra_driver_name        = "mv-ecb-aes",
        .cra_priority   = 300,
-       .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+       .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                         CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
        .cra_blocksize  = 16,
        .cra_ctxsize    = sizeof(struct mv_ctx),
        .cra_alignmask  = 0,
@@ -921,7 +922,8 @@ struct crypto_alg mv_aes_alg_cbc = {
        .cra_name               = "cbc(aes)",
        .cra_driver_name        = "mv-cbc-aes",
        .cra_priority   = 300,
-       .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+       .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                         CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
        .cra_blocksize  = AES_BLOCK_SIZE,
        .cra_ctxsize    = sizeof(struct mv_ctx),
        .cra_alignmask  = 0,
@@ -953,7 +955,8 @@ struct ahash_alg mv_sha1_alg = {
                          .cra_driver_name = "mv-sha1",
                          .cra_priority = 300,
                          .cra_flags =
-                         CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,
+                         CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
+                         CRYPTO_ALG_NEED_FALLBACK,
                          .cra_blocksize = SHA1_BLOCK_SIZE,
                          .cra_ctxsize = sizeof(struct mv_tfm_hash_ctx),
                          .cra_init = mv_cra_hash_sha1_init,
@@ -977,7 +980,8 @@ struct ahash_alg mv_hmac_sha1_alg = {
                          .cra_driver_name = "mv-hmac-sha1",
                          .cra_priority = 300,
                          .cra_flags =
-                         CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,
+                         CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
+                         CRYPTO_ALG_NEED_FALLBACK,
                          .cra_blocksize = SHA1_BLOCK_SIZE,
                          .cra_ctxsize = sizeof(struct mv_tfm_hash_ctx),
                          .cra_init = mv_cra_hash_hmac_sha1_init,