crypto: api - Move cryptomgr soft dependency into algapi

The soft dependency on cryptomgr is only needed in algapi because if algapi isn't present then no algorithms can be loaded. This also fixes the case where api is built-in but algapi is built as a module as the soft dependency would otherwise get lost. Fixes: 8ab23d5 ("crypto: api - Add softdep on cryptomgr") Reported-by: Jan Beulich <[email protected]> Signed-off-by: Herbert Xu <[email protected]> Tested-by: Jan Beulich <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
josf · Feb 5, 2022 · c6ce9c5 · c6ce9c5
1 parent 47307c3
commit c6ce9c5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/crypto/algapi.c b/crypto/algapi.c
@@ -1324,3 +1324,4 @@ module_exit(crypto_algapi_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Cryptographic algorithms API");
+MODULE_SOFTDEP("pre: cryptomgr");
diff --git a/crypto/api.c b/crypto/api.c
@@ -643,4 +643,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done);
 
 MODULE_DESCRIPTION("Cryptographic core API");
 MODULE_LICENSE("GPL");
-MODULE_SOFTDEP("pre: cryptomgr");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1324,3 +1324,4 @@ module_exit(crypto_algapi_exit);

		MODULE_LICENSE("GPL");
		MODULE_DESCRIPTION("Cryptographic algorithms API");
		MODULE_SOFTDEP("pre: cryptomgr");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -643,4 +643,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done);

		MODULE_DESCRIPTION("Cryptographic core API");
		MODULE_LICENSE("GPL");
		MODULE_SOFTDEP("pre: cryptomgr");