aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/aes_ccm.h
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-01-21 01:33:48 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-01-21 01:33:48 +0100
commit68e6d7d60c0b35990cb8056e317ba97f0fe73047 (patch)
tree92a7e8745a05aefdb0464eefb0691ae568ca2367 /net/mac80211/aes_ccm.h
parent3619db98361964903b81cfad1df177ba2545adb3 (diff)
downloadkernel_samsung_smdk4412-68e6d7d60c0b35990cb8056e317ba97f0fe73047.zip
kernel_samsung_smdk4412-68e6d7d60c0b35990cb8056e317ba97f0fe73047.tar.gz
kernel_samsung_smdk4412-68e6d7d60c0b35990cb8056e317ba97f0fe73047.tar.bz2
Backport mac80211 from 3.4 kernel
The ath9k_htc driver depends on mac80211, but mac80211 can't be build. The reason is that net/wireless is almost completely backported from a 3.4 kernel. To follow suit, mac80211 is also backported from 3.4, more precisely from 3.4.113. This makes mac80211 build. Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
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,