ath9k: Use common ath key management functions
Use key management functions which have been moved to ath/key.c and remove ath9k copies of these functions and other now unused definitions. Signed-off-by: Bruno Randolf <br1@einfach.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
781f3136ff
commit
040e539e8e
@@ -660,17 +660,6 @@ struct ath9k_11n_rate_series {
|
||||
u32 RateFlags;
|
||||
};
|
||||
|
||||
struct ath9k_keyval {
|
||||
u8 kv_type;
|
||||
u8 kv_pad;
|
||||
u16 kv_len;
|
||||
u8 kv_val[16]; /* TK */
|
||||
u8 kv_mic[8]; /* Michael MIC key */
|
||||
u8 kv_txmic[8]; /* Michael MIC TX key (used only if the hardware
|
||||
* supports both MIC keys in the same key cache entry;
|
||||
* in that case, kv_mic is the RX key) */
|
||||
};
|
||||
|
||||
enum ath9k_key_type {
|
||||
ATH9K_KEY_TYPE_CLEAR,
|
||||
ATH9K_KEY_TYPE_WEP,
|
||||
@@ -678,16 +667,6 @@ enum ath9k_key_type {
|
||||
ATH9K_KEY_TYPE_TKIP,
|
||||
};
|
||||
|
||||
enum ath9k_cipher {
|
||||
ATH9K_CIPHER_WEP = 0,
|
||||
ATH9K_CIPHER_AES_OCB = 1,
|
||||
ATH9K_CIPHER_AES_CCM = 2,
|
||||
ATH9K_CIPHER_CKIP = 3,
|
||||
ATH9K_CIPHER_TKIP = 4,
|
||||
ATH9K_CIPHER_CLR = 5,
|
||||
ATH9K_CIPHER_MIC = 127
|
||||
};
|
||||
|
||||
struct ath_hw;
|
||||
struct ath9k_channel;
|
||||
|
||||
|
Reference in New Issue
Block a user