summaryrefslogtreecommitdiffstats
path: root/net/mac80211/aes_cmac.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-07-06 22:02:14 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-07-08 11:11:24 -0400
commit0cd20a278e1ef9da9f6a987942794c9d65af8c4d (patch)
treeefd5aa9a72518f32518dcb4b85b78626cbc8113e /net/mac80211/aes_cmac.c
parent544e5d8bcd7ab305494e57cfa388b2d06a43c520 (diff)
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>
Diffstat (limited to 'net/mac80211/aes_cmac.c')
-rw-r--r--net/mac80211/aes_cmac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/aes_cmac.c b/net/mac80211/aes_cmac.c
index 08b0f1768aa..8dfd70d8fcf 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