crypto: api - Move cryptomgr soft dependency into algapi

herbertx · herbertx · commit c6ce9c5831ca · 2022-02-05T15:10:07.000+11:00
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 <jbeulich@suse.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Tested-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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
`@@ -1324,3 +1324,4 @@ module_exit(crypto_algapi_exit);`
`1324`	`1324`
`1325`	`1325`	`MODULE_LICENSE("GPL");`
`1326`	`1326`	`MODULE_DESCRIPTION("Cryptographic algorithms API");`
	`1327`	`+MODULE_SOFTDEP("pre: cryptomgr");`
Original file line number	Diff line number	Diff line change
`@@ -643,4 +643,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done);`
`643`	`643`
`644`	`644`	`MODULE_DESCRIPTION("Cryptographic core API");`
`645`	`645`	`MODULE_LICENSE("GPL");`
`646`		`-MODULE_SOFTDEP("pre: cryptomgr");`