summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath.h
diff options
context:
space:
mode:
authorBruno Randolf <br1@einfach.org>2010-09-08 09:04:54 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-09-16 21:19:45 +0200
commit117675d06ad2dd16fcf466669ba9700a8d589ea3 (patch)
treeb8239f2eea26890607b3adfe5115022573a59c32 /drivers/net/wireless/ath/ath.h
parentath5k: Remove old ath5k key handling functions (diff)
downloadlinux-117675d06ad2dd16fcf466669ba9700a8d589ea3.tar.xz
linux-117675d06ad2dd16fcf466669ba9700a8d589ea3.zip
ath/ath9k: Replace common->splitmic with a flag
Replace common->splitmic with ATH_CRYPT_CAP_MIC_COMBINED flag. splitmic has to be used when the ATH_CRYPT_CAP_MIC_COMBINED capability flag is not set. Signed-off-by: Bruno Randolf <br1@einfach.org> Acked-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath.h')
-rw-r--r--drivers/net/wireless/ath/ath.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index fb24f66373fd..c5584077d1de 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -78,6 +78,7 @@ enum ath_crypt_caps {
ATH_CRYPT_CAP_CIPHER_AESCCM = BIT(3),
ATH_CRYPT_CAP_CIPHER_CKIP = BIT(4),
ATH_CRYPT_CAP_CIPHER_TKIP = BIT(5),
+ ATH_CRYPT_CAP_MIC_COMBINED = BIT(6),
};
struct ath_keyval {
@@ -150,7 +151,6 @@ struct ath_common {
u32 keymax;
DECLARE_BITMAP(keymap, ATH_KEYMAX);
DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX);
- u8 splitmic;
enum ath_crypt_caps crypt_caps;
struct ath_regulatory regulatory;