tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

crypto: s390/aes - fix name clash after AES library refactor

The newly introduced AES library exposes aes_encrypt/aes_decrypt
routines so rename existing occurrences of those identifiers in
the s390 driver.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Ard Biesheuvel and committed by
Herbert Xu 931c940f 8dfa20fc

+4 -4
+4 -4
arch/s390/crypto/aes_s390.c
··· 108 108 return 0; 109 109 } 110 110 111 - static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) 111 + static void crypto_aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) 112 112 { 113 113 struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm); 114 114 ··· 119 119 cpacf_km(sctx->fc, &sctx->key, out, in, AES_BLOCK_SIZE); 120 120 } 121 121 122 - static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) 122 + static void crypto_aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) 123 123 { 124 124 struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm); 125 125 ··· 172 172 .cia_min_keysize = AES_MIN_KEY_SIZE, 173 173 .cia_max_keysize = AES_MAX_KEY_SIZE, 174 174 .cia_setkey = aes_set_key, 175 - .cia_encrypt = aes_encrypt, 176 - .cia_decrypt = aes_decrypt, 175 + .cia_encrypt = crypto_aes_encrypt, 176 + .cia_decrypt = crypto_aes_decrypt, 177 177 } 178 178 } 179 179 };