aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBruno Randolf <br1@einfach.org>2010-09-08 03:04:33 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-09-16 15:19:44 -0400
commit34a1305137f484ee1806df5a00b9d8ee8d4ef758 (patch)
treea47a23365b6ecc848dd486f296da8b458890af00 /drivers/net
parent9c376639297d3dd82d40e54c9cdca8da9dfc22f1 (diff)
ath: Copy cryptographic capability flags into ath
This will be used later in this patch series. Signed-off-by: Bruno Randolf <br1@einfach.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index a706202fa67..057fdd7ddaf 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -71,6 +71,15 @@ struct ath_regulatory {
71 struct reg_dmn_pair_mapping *regpair; 71 struct reg_dmn_pair_mapping *regpair;
72}; 72};
73 73
74enum ath_crypt_caps {
75 ATH_CRYPT_CAP_MIC_AESCCM = BIT(0),
76 ATH_CRYPT_CAP_MIC_CKIP = BIT(1),
77 ATH_CRYPT_CAP_MIC_TKIP = BIT(2),
78 ATH_CRYPT_CAP_CIPHER_AESCCM = BIT(3),
79 ATH_CRYPT_CAP_CIPHER_CKIP = BIT(4),
80 ATH_CRYPT_CAP_CIPHER_TKIP = BIT(5),
81};
82
74/** 83/**
75 * struct ath_ops - Register read/write operations 84 * struct ath_ops - Register read/write operations
76 * 85 *
@@ -121,6 +130,7 @@ struct ath_common {
121 DECLARE_BITMAP(keymap, ATH_KEYMAX); 130 DECLARE_BITMAP(keymap, ATH_KEYMAX);
122 DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX); 131 DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX);
123 u8 splitmic; 132 u8 splitmic;
133 enum ath_crypt_caps crypt_caps;
124 134
125 struct ath_regulatory regulatory; 135 struct ath_regulatory regulatory;
126 const struct ath_ops *ops; 136 const struct ath_ops *ops;