diff options
author | Bruno Randolf <br1@einfach.org> | 2010-09-08 03:04:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-16 15:19:45 -0400 |
commit | 117675d06ad2dd16fcf466669ba9700a8d589ea3 (patch) | |
tree | b8239f2eea26890607b3adfe5115022573a59c32 /drivers/net/wireless/ath/ath.h | |
parent | d8878f83cf1cc0061e8b3bcf7dbd589410a51039 (diff) |
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.h | 2 |
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 { | |||
78 | ATH_CRYPT_CAP_CIPHER_AESCCM = BIT(3), | 78 | ATH_CRYPT_CAP_CIPHER_AESCCM = BIT(3), |
79 | ATH_CRYPT_CAP_CIPHER_CKIP = BIT(4), | 79 | ATH_CRYPT_CAP_CIPHER_CKIP = BIT(4), |
80 | ATH_CRYPT_CAP_CIPHER_TKIP = BIT(5), | 80 | ATH_CRYPT_CAP_CIPHER_TKIP = BIT(5), |
81 | ATH_CRYPT_CAP_MIC_COMBINED = BIT(6), | ||
81 | }; | 82 | }; |
82 | 83 | ||
83 | struct ath_keyval { | 84 | struct ath_keyval { |
@@ -150,7 +151,6 @@ struct ath_common { | |||
150 | u32 keymax; | 151 | u32 keymax; |
151 | DECLARE_BITMAP(keymap, ATH_KEYMAX); | 152 | DECLARE_BITMAP(keymap, ATH_KEYMAX); |
152 | DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX); | 153 | DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX); |
153 | u8 splitmic; | ||
154 | enum ath_crypt_caps crypt_caps; | 154 | enum ath_crypt_caps crypt_caps; |
155 | 155 | ||
156 | struct ath_regulatory regulatory; | 156 | struct ath_regulatory regulatory; |