Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c

1 files changed, 4 insertions, 4 deletions

diff --git a/crypto/algboss.c b/crypto/algboss.c
index 40bd391f34d..791d194958f 100644
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -206,13 +206,16 @@ err:
         return NOTIFY_OK;
 }
 
-#ifdef CONFIG_CRYPTO_MANAGER_TESTS
 static int cryptomgr_test(void *data)
 {
         struct crypto_test_param *param = data;
         u32 type = param->type;
         int err = 0;
 
+#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
+        goto skiptest;
+#endif
+
         if (type & CRYPTO_ALG_TESTED)
                 goto skiptest;
 
@@ -267,7 +270,6 @@ err_put_module:
 err:
         return NOTIFY_OK;
 }
-#endif /* CONFIG_CRYPTO_MANAGER_TESTS */
 
 static int cryptomgr_notify(struct notifier_block *this, unsigned long msg,
                             void *data)
@@ -275,10 +277,8 @@ static int cryptomgr_notify(struct notifier_block *this, unsigned long msg,
         switch (msg) {
         case CRYPTO_MSG_ALG_REQUEST:
                 return cryptomgr_schedule_probe(data);
-#ifdef CONFIG_CRYPTO_MANAGER_TESTS
         case CRYPTO_MSG_ALG_REGISTER:
                 return cryptomgr_schedule_test(data);
-#endif
         }
 
         return NOTIFY_DONE;