diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-05-20 18:45:26 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2006-06-26 03:34:40 -0400 |
commit | d913ea0d6b6a48dd6eed8fc5e299b8b10e049186 (patch) | |
tree | baa603652c2428baa923dd5eef5773489c624ecf | |
parent | c7fc05992afcf1d63d6d5fb6142c8d39094dbca9 (diff) |
[CRYPTO] api: Removed const from cra_name/cra_driver_name
We do need to change these names now and even more so in future with
instantiated algorithms. So let's stop lying to the compiler and get
rid of the const modifiers.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | crypto/api.c | 2 | ||||
-rw-r--r-- | include/linux/crypto.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/api.c b/crypto/api.c index 8145310d7985..735fdedd8217 100644 --- a/crypto/api.c +++ b/crypto/api.c | |||
@@ -229,7 +229,7 @@ void crypto_free_tfm(struct crypto_tfm *tfm) | |||
229 | static inline int crypto_set_driver_name(struct crypto_alg *alg) | 229 | static inline int crypto_set_driver_name(struct crypto_alg *alg) |
230 | { | 230 | { |
231 | static const char suffix[] = "-generic"; | 231 | static const char suffix[] = "-generic"; |
232 | char *driver_name = (char *)alg->cra_driver_name; | 232 | char *driver_name = alg->cra_driver_name; |
233 | int len; | 233 | int len; |
234 | 234 | ||
235 | if (*driver_name) | 235 | if (*driver_name) |
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 6c013c88080f..7f946241b879 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h | |||
@@ -128,8 +128,8 @@ struct crypto_alg { | |||
128 | 128 | ||
129 | int cra_priority; | 129 | int cra_priority; |
130 | 130 | ||
131 | const char cra_name[CRYPTO_MAX_ALG_NAME]; | 131 | char cra_name[CRYPTO_MAX_ALG_NAME]; |
132 | const char cra_driver_name[CRYPTO_MAX_ALG_NAME]; | 132 | char cra_driver_name[CRYPTO_MAX_ALG_NAME]; |
133 | 133 | ||
134 | union { | 134 | union { |
135 | struct cipher_alg cipher; | 135 | struct cipher_alg cipher; |