diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index dfc7a982fc7..5bc022087e6 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2010 Atheros Communications Inc. | 2 | * Copyright (c) 2010-2011 Atheros Communications Inc. |
3 | * | 3 | * |
4 | * Permission to use, copy, modify, and/or distribute this software for any | 4 | * Permission to use, copy, modify, and/or distribute this software for any |
5 | * purpose with or without fee is hereby granted, provided that the above | 5 | * purpose with or without fee is hereby granted, provided that the above |
@@ -46,15 +46,8 @@ extern struct ieee80211_ops ath9k_htc_ops; | |||
46 | extern int htc_modparam_nohwcrypt; | 46 | extern int htc_modparam_nohwcrypt; |
47 | 47 | ||
48 | enum htc_phymode { | 48 | enum htc_phymode { |
49 | HTC_MODE_AUTO = 0, | 49 | HTC_MODE_11NA = 0, |
50 | HTC_MODE_11A = 1, | 50 | HTC_MODE_11NG = 1 |
51 | HTC_MODE_11B = 2, | ||
52 | HTC_MODE_11G = 3, | ||
53 | HTC_MODE_FH = 4, | ||
54 | HTC_MODE_TURBO_A = 5, | ||
55 | HTC_MODE_TURBO_G = 6, | ||
56 | HTC_MODE_11NA = 7, | ||
57 | HTC_MODE_11NG = 8 | ||
58 | }; | 51 | }; |
59 | 52 | ||
60 | enum htc_opmode { | 53 | enum htc_opmode { |
@@ -123,18 +116,13 @@ struct ath9k_htc_target_vif { | |||
123 | u8 pad; | 116 | u8 pad; |
124 | } __packed; | 117 | } __packed; |
125 | 118 | ||
126 | #define ATH_HTC_STA_AUTH 0x0001 | ||
127 | #define ATH_HTC_STA_QOS 0x0002 | ||
128 | #define ATH_HTC_STA_ERP 0x0004 | ||
129 | #define ATH_HTC_STA_HT 0x0008 | ||
130 | |||
131 | struct ath9k_htc_target_sta { | 119 | struct ath9k_htc_target_sta { |
132 | u8 macaddr[ETH_ALEN]; | 120 | u8 macaddr[ETH_ALEN]; |
133 | u8 bssid[ETH_ALEN]; | 121 | u8 bssid[ETH_ALEN]; |
134 | u8 sta_index; | 122 | u8 sta_index; |
135 | u8 vif_index; | 123 | u8 vif_index; |
136 | u8 is_vif_sta; | 124 | u8 is_vif_sta; |
137 | __be16 flags; /* ATH_HTC_STA_* */ | 125 | __be16 flags; |
138 | __be16 htcap; | 126 | __be16 htcap; |
139 | __be16 maxampdu; | 127 | __be16 maxampdu; |
140 | u8 pad; | 128 | u8 pad; |
@@ -285,9 +273,9 @@ struct ath9k_htc_rx { | |||
285 | }; | 273 | }; |
286 | 274 | ||
287 | #define ATH9K_HTC_TX_CLEANUP_INTERVAL 50 /* ms */ | 275 | #define ATH9K_HTC_TX_CLEANUP_INTERVAL 50 /* ms */ |
288 | #define ATH9K_HTC_TX_TIMEOUT_INTERVAL 2500 /* ms */ | 276 | #define ATH9K_HTC_TX_TIMEOUT_INTERVAL 3000 /* ms */ |
289 | #define ATH9K_HTC_TX_RESERVE 10 | 277 | #define ATH9K_HTC_TX_RESERVE 10 |
290 | #define ATH9K_HTC_TX_TIMEOUT_COUNT 20 | 278 | #define ATH9K_HTC_TX_TIMEOUT_COUNT 40 |
291 | #define ATH9K_HTC_TX_THRESHOLD (MAX_TX_BUF_NUM - ATH9K_HTC_TX_RESERVE) | 279 | #define ATH9K_HTC_TX_THRESHOLD (MAX_TX_BUF_NUM - ATH9K_HTC_TX_RESERVE) |
292 | 280 | ||
293 | #define ATH9K_HTC_OP_TX_QUEUES_STOP BIT(0) | 281 | #define ATH9K_HTC_OP_TX_QUEUES_STOP BIT(0) |
@@ -450,6 +438,7 @@ struct ath9k_htc_priv { | |||
450 | u8 vif_sta_pos[ATH9K_HTC_MAX_VIF]; | 438 | u8 vif_sta_pos[ATH9K_HTC_MAX_VIF]; |
451 | u8 num_ibss_vif; | 439 | u8 num_ibss_vif; |
452 | u8 num_sta_vif; | 440 | u8 num_sta_vif; |
441 | u8 num_sta_assoc_vif; | ||
453 | u8 num_ap_vif; | 442 | u8 num_ap_vif; |
454 | 443 | ||
455 | u16 op_flags; | 444 | u16 op_flags; |