From 1e154a6da5bce196d7ff539a515a5a470bdcf94d Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Sun, 19 Aug 2012 14:51:44 +0200
Subject: [PATCH] --- yaml --- r: 327664 b: refs/heads/master c:
 d348f69f59af769c405c2f43a2d326d7123ef75a h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/mac80211/aes_cmac.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6d4ebeaf7636..84df218004cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b3d1cc213f96bfffb5b7808d859b9ad26149e82
+refs/heads/master: d348f69f59af769c405c2f43a2d326d7123ef75a
diff --git a/trunk/net/mac80211/aes_cmac.c b/trunk/net/mac80211/aes_cmac.c
index 8dfd70d8fcfb..a04752e91023 100644
--- a/trunk/net/mac80211/aes_cmac.c
+++ b/trunk/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;