mac80211: simplify buffers in aes_128_cmac_vector

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=d348f69f59af769c405c2f43a2d326d7123ef75a
Commit:     d348f69f59af769c405c2f43a2d326d7123ef75a
Parent:     8b3d1cc213f96bfffb5b7808d859b9ad26149e82
Author:     Johannes Berg <johannes.berg at intel.com>
AuthorDate: Sun Aug 19 14:51:44 2012 +0200
Committer:  Johannes Berg <johannes.berg at intel.com>
CommitDate: Mon Aug 20 14:03:18 2012 +0200

    mac80211: simplify buffers in aes_128_cmac_vector
    
    There's no need to use a single scratch buffer and
    calculate offsets into it, just use two separate
    buffers for the separate variables.
    
    Signed-off-by: Johannes Berg <johannes.berg at intel.com>
---
 net/mac80211/aes_cmac.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/net/mac80211/aes_cmac.c b/net/mac80211/aes_cmac.c
index 8dfd70d..a04752e 100644
--- a/net/mac80211/aes_cmac.c
+++ b/net/mac80211/aes_cmac.c
@@ -38,14 +38,10 @@ static void gf_mulx(u8 *pad)
 static void aes_128_cmac_vector(struct crypto_cipher *tfm, size_t num_elem,
 				const u8 *addr[], const size_t *len, u8 *mac)
 {
-	u8 scratch[2 * AES_BLOCK_SIZE];
-	u8 *cbc, *pad;
+	u8 cbc[AES_BLOCK_SIZE], pad[AES_BLOCK_SIZE];
 	const u8 *pos, *end;
 	size_t i, e, left, total_len;
 
-	cbc = scratch;
-	pad = scratch + AES_BLOCK_SIZE;
-
 	memset(cbc, 0, AES_BLOCK_SIZE);
 
 	total_len = 0;