aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
diff options
context:
space:
mode:
authorBen Cahill <ben.m.cahill@intel.com>2007-11-28 22:09:47 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:05:17 -0500
commit9fbab5163aa8cb3a5aef845fbf67b0c1c85030b6 (patch)
tree6e078dc2ea37ea4aff9b2fb262ef278ae12b61b5 /drivers/net/wireless/iwlwifi/iwl-3945-rs.h
parent40ac81a35c3a19f6a78f0a9f58368d36048df35b (diff)
iwlwifi: clean up and clarify some comments after 3945/4965 split
Clean up and clarify some comments after 3945/4965 split. Signed-off-by: Ben Cahill <ben.m.cahill@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945-rs.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945-rs.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.h b/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
index 075f7de0976e..e21a5bae687f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
@@ -28,8 +28,8 @@
28#define __iwl_3945_rs_h__ 28#define __iwl_3945_rs_h__
29 29
30struct iwl3945_rate_info { 30struct iwl3945_rate_info {
31 u8 plcp; 31 u8 plcp; /* uCode API: IWL_RATE_6M_PLCP, etc. */
32 u8 ieee; 32 u8 ieee; /* MAC header: IWL_RATE_6M_IEEE, etc. */
33 u8 prev_ieee; /* previous rate in IEEE speeds */ 33 u8 prev_ieee; /* previous rate in IEEE speeds */
34 u8 next_ieee; /* next rate in IEEE speeds */ 34 u8 next_ieee; /* next rate in IEEE speeds */
35 u8 prev_rs; /* previous rate used in rs algo */ 35 u8 prev_rs; /* previous rate used in rs algo */
@@ -38,9 +38,12 @@ struct iwl3945_rate_info {
38 u8 next_rs_tgg; /* next rate used in TGG rs algo */ 38 u8 next_rs_tgg; /* next rate used in TGG rs algo */
39 u8 table_rs_index; /* index in rate scale table cmd */ 39 u8 table_rs_index; /* index in rate scale table cmd */
40 u8 prev_table_rs; /* prev in rate table cmd */ 40 u8 prev_table_rs; /* prev in rate table cmd */
41
42}; 41};
43 42
43/*
44 * These serve as indexes into
45 * struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT];
46 */
44enum { 47enum {
45 IWL_RATE_1M_INDEX = 0, 48 IWL_RATE_1M_INDEX = 0,
46 IWL_RATE_2M_INDEX, 49 IWL_RATE_2M_INDEX,
@@ -96,6 +99,7 @@ enum {
96#define IWL_RATE_5M_MASK (1<<IWL_RATE_5M_INDEX) 99#define IWL_RATE_5M_MASK (1<<IWL_RATE_5M_INDEX)
97#define IWL_RATE_11M_MASK (1<<IWL_RATE_11M_INDEX) 100#define IWL_RATE_11M_MASK (1<<IWL_RATE_11M_INDEX)
98 101
102/* 3945 uCode API values for (legacy) bit rates, both OFDM and CCK */
99enum { 103enum {
100 IWL_RATE_6M_PLCP = 13, 104 IWL_RATE_6M_PLCP = 13,
101 IWL_RATE_9M_PLCP = 15, 105 IWL_RATE_9M_PLCP = 15,
@@ -111,6 +115,7 @@ enum {
111 IWL_RATE_11M_PLCP = 110, 115 IWL_RATE_11M_PLCP = 110,
112}; 116};
113 117
118/* MAC header values for bit rates */
114enum { 119enum {
115 IWL_RATE_6M_IEEE = 12, 120 IWL_RATE_6M_IEEE = 12,
116 IWL_RATE_9M_IEEE = 18, 121 IWL_RATE_9M_IEEE = 18,