summaryrefslogtreecommitdiffstats
path: root/net/mac80211/aes_ccm.h
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_ccm.h
parent544e5d8bcd7ab305494e57cfa388b2d06a43c520 (diff)
downloadop-kernel-dev-0cd20a278e1ef9da9f6a987942794c9d65af8c4d.zip
op-kernel-dev-0cd20a278e1ef9da9f6a987942794c9d65af8c4d.tar.gz
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_ccm.h')
-rw-r--r--net/mac80211/aes_ccm.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/aes_ccm.h b/net/mac80211/aes_ccm.h
index 6e7820e..5b7d744 100644
--- a/net/mac80211/aes_ccm.h
+++ b/net/mac80211/aes_ccm.h
@@ -12,8 +12,6 @@
#include <linux/crypto.h>
-#define AES_BLOCK_LEN 16
-
struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[]);
void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
u8 *data, size_t data_len,
OpenPOWER on IntegriCloud