commit 0cd20a278e1ef9da9f6a987942794c9d65af8c4d
author Johannes Berg <johannes.berg@intel.com> Wed Jul 06 22:02:14 2011 +0200
committer John W. Linville <linville@tuxdriver.com> Fri Jul 08 11:11:24 2011 -0400
tree efd5aa9a72518f32518dcb4b85b78626cbc8113e
parent 544e5d8bcd7ab305494e57cfa388b2d06a43c520

mac80211: use AES_BLOCK_SIZE

mac80211 has a defnition of AES_BLOCK_SIZE and
multiple definitions of AES_BLOCK_LEN. Remove
them all and use crypto/aes.h.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/mac80211/aes_cmac.c

diff --git a/net/mac80211/aes_cmac.c b/net/mac80211/aes_cmac.c
index 08b0f17..8dfd70d 100644
--- a/net/mac80211/aes_cmac.c
+++ b/net/mac80211/aes_cmac.c
@@ -11,12 +11,12 @@
 #include <linux/types.h>
 #include <linux/crypto.h>
 #include <linux/err.h>
+#include <crypto/aes.h>
 
 #include <net/mac80211.h>
 #include "key.h"
 #include "aes_cmac.h"
 
-#define AES_BLOCK_SIZE 16
 #define AES_CMAC_KEY_LEN 16
 #define CMAC_TLEN 8 /* CMAC TLen = 64 bits (8 octets) */
 #define AAD_LEN 20