kernel: update linux 3.10 to 3.10 final

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.10 / 260-crypto_test_dependencies.patch

diff --git a/target/linux/generic/patches-3.10/260-crypto_test_dependencies.patch b/target/linux/generic/patches-3.10/260-crypto_test_dependencies.patch
index 8cc15e470ba43f5aa830d78eb3efa4617c11ecff..a28f69308c2611d12566d9027ad299d3cbb48579 100644 (file)
--- a/target/linux/generic/patches-3.10/260-crypto_test_dependencies.patch
+++ b/target/linux/generic/patches-3.10/260-crypto_test_dependencies.patch
@@ -17,7 +17,7 @@
        tristate "Userspace cryptographic algorithm configuration"
 --- a/crypto/algboss.c
 +++ b/crypto/algboss.c
-@@ -247,6 +247,9 @@ static int cryptomgr_schedule_test(struc
+@@ -248,6 +248,9 @@ static int cryptomgr_schedule_test(struc
        type = alg->cra_flags;
  
        /* This piece of crap needs to disappear into per-type test hooks. */
@@ -27,7 +27,7 @@
        if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
               CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
             ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
-@@ -255,6 +258,7 @@ static int cryptomgr_schedule_test(struc
+@@ -256,6 +259,7 @@ static int cryptomgr_schedule_test(struc
            (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) &&
             alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize))
                type |= CRYPTO_ALG_TESTED;