diff options
author | Halperin, Daniel C <daniel.c.halperin@intel.com> | 2008-11-07 12:58:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-21 11:06:08 -0500 |
commit | 5c5aa3f13a50881b8f6e529e321bbefb5faec37b (patch) | |
tree | 7727feb9dd9f22b011ed80dc95418669d8867e3b /drivers/net/wireless | |
parent | a71c8f62d46e4496011182658dc058303960c068 (diff) |
iwlwifi: update iwl-commands.h for 3 stream support
This patch updates comments and constants to support 1, 2, or 3 spatial streams
in rate_n_flags .
Signed-off-by: Daniel Halperin <daniel.c.halperin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index 8aade00e165a..1fe83d45443a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
@@ -213,10 +213,11 @@ struct iwl_cmd_header { | |||
213 | } __attribute__ ((packed)); | 213 | } __attribute__ ((packed)); |
214 | 214 | ||
215 | /** | 215 | /** |
216 | * 4965 rate_n_flags bit fields | 216 | * iwlagn rate_n_flags bit fields |
217 | * | 217 | * |
218 | * rate_n_flags format is used in following 4965 commands: | 218 | * rate_n_flags format is used in following iwlagn commands: |
219 | * REPLY_RX (response only) | 219 | * REPLY_RX (response only) |
220 | * REPLY_RX_MPDU (response only) | ||
220 | * REPLY_TX (both command and response) | 221 | * REPLY_TX (both command and response) |
221 | * REPLY_TX_LINK_QUALITY_CMD | 222 | * REPLY_TX_LINK_QUALITY_CMD |
222 | * | 223 | * |
@@ -230,8 +231,9 @@ struct iwl_cmd_header { | |||
230 | * 6) 54 Mbps | 231 | * 6) 54 Mbps |
231 | * 7) 60 Mbps | 232 | * 7) 60 Mbps |
232 | * | 233 | * |
233 | * 3: 0) Single stream (SISO) | 234 | * 4-3: 0) Single stream (SISO) |
234 | * 1) Dual stream (MIMO) | 235 | * 1) Dual stream (MIMO) |
236 | * 2) Triple stream (MIMO) | ||
235 | * | 237 | * |
236 | * 5: Value of 0x20 in bits 7:0 indicates 6 Mbps FAT duplicate data | 238 | * 5: Value of 0x20 in bits 7:0 indicates 6 Mbps FAT duplicate data |
237 | * | 239 | * |
@@ -252,8 +254,8 @@ struct iwl_cmd_header { | |||
252 | * 110) 11 Mbps | 254 | * 110) 11 Mbps |
253 | */ | 255 | */ |
254 | #define RATE_MCS_CODE_MSK 0x7 | 256 | #define RATE_MCS_CODE_MSK 0x7 |
255 | #define RATE_MCS_MIMO_POS 3 | 257 | #define RATE_MCS_SPATIAL_POS 3 |
256 | #define RATE_MCS_MIMO_MSK 0x8 | 258 | #define RATE_MCS_SPATIAL_MSK 0x18 |
257 | #define RATE_MCS_HT_DUP_POS 5 | 259 | #define RATE_MCS_HT_DUP_POS 5 |
258 | #define RATE_MCS_HT_DUP_MSK 0x20 | 260 | #define RATE_MCS_HT_DUP_MSK 0x20 |
259 | 261 | ||