From: Krzysztof Hałasa <khc@pm.waw.pl>
Date: Tue, 28 Dec 2010 12:08:18 +0000 (+0100)
Subject: IXP4xx crypto: MOD_AES{128,192,256} already include key size.
X-Git-Tag: next-20121015~7^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f23225a34ed711be5ec7e1b47699ef75f904524f;p=karo-tx-linux.git

IXP4xx crypto: MOD_AES{128,192,256} already include key size.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
---

diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index 8f3f74ce8c7f..21180d6cad6e 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -750,12 +750,12 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt,
 	}
 	if (cipher_cfg & MOD_AES) {
 		switch (key_len) {
-			case 16: keylen_cfg = MOD_AES128 | KEYLEN_128; break;
-			case 24: keylen_cfg = MOD_AES192 | KEYLEN_192; break;
-			case 32: keylen_cfg = MOD_AES256 | KEYLEN_256; break;
-			default:
-				*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-				return -EINVAL;
+		case 16: keylen_cfg = MOD_AES128; break;
+		case 24: keylen_cfg = MOD_AES192; break;
+		case 32: keylen_cfg = MOD_AES256; break;
+		default:
+			*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+			return -EINVAL;
 		}
 		cipher_cfg |= keylen_cfg;
 	} else if (cipher_cfg & MOD_3DES) {