diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:29:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:29:28 +0100 |
| commit | d1f3ed16034fc598fc713f0390fdb0a3f80e4b5a (patch) | |
| tree | b3117a0cb33e649278d9bf552bf33a40e273f0f0 | |
| parent | 624657a6c814a324c3118534f26916a533692257 (diff) | |
| parent | 89dd1d477cb68a6fb936b97560e1f85191b50d39 (diff) | |
| download | linux-crypto-d1f3ed16034fc598fc713f0390fdb0a3f80e4b5a.tar.gz linux-crypto-d1f3ed16034fc598fc713f0390fdb0a3f80e4b5a.zip | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/include/asm/fixmap_64.h
| -rw-r--r-- | crypto/api.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/crypto/api.c b/crypto/api.c index efe77df6..38a2bc02 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -215,8 +215,19 @@ struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, u32 mask) mask &= ~(CRYPTO_ALG_LARVAL | CRYPTO_ALG_DEAD); type &= mask; - alg = try_then_request_module(crypto_alg_lookup(name, type, mask), - name); + alg = crypto_alg_lookup(name, type, mask); + if (!alg) { + char tmp[CRYPTO_MAX_ALG_NAME]; + + request_module(name); + + if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask) && + snprintf(tmp, sizeof(tmp), "%s-all", name) < sizeof(tmp)) + request_module(tmp); + + alg = crypto_alg_lookup(name, type, mask); + } + if (alg) return crypto_is_larval(alg) ? crypto_larval_wait(alg) : alg; |