Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 79046
b: refs/heads/master
c: 9fbab51
h: refs/heads/master
v: v3
  • Loading branch information
Ben Cahill authored and David S. Miller committed Jan 28, 2008
1 parent 7843009 commit 208e1a6
Show file tree
Hide file tree
Showing 5 changed files with 133 additions and 174 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40ac81a35c3a19f6a78f0a9f58368d36048df35b
refs/heads/master: 9fbab5163aa8cb3a5aef845fbf67b0c1c85030b6
11 changes: 8 additions & 3 deletions trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#define __iwl_3945_rs_h__

struct iwl3945_rate_info {
u8 plcp;
u8 ieee;
u8 plcp; /* uCode API: IWL_RATE_6M_PLCP, etc. */
u8 ieee; /* MAC header: IWL_RATE_6M_IEEE, etc. */
u8 prev_ieee; /* previous rate in IEEE speeds */
u8 next_ieee; /* next rate in IEEE speeds */
u8 prev_rs; /* previous rate used in rs algo */
Expand All @@ -38,9 +38,12 @@ struct iwl3945_rate_info {
u8 next_rs_tgg; /* next rate used in TGG rs algo */
u8 table_rs_index; /* index in rate scale table cmd */
u8 prev_table_rs; /* prev in rate table cmd */

};

/*
* These serve as indexes into
* struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT];
*/
enum {
IWL_RATE_1M_INDEX = 0,
IWL_RATE_2M_INDEX,
Expand Down Expand Up @@ -96,6 +99,7 @@ enum {
#define IWL_RATE_5M_MASK (1<<IWL_RATE_5M_INDEX)
#define IWL_RATE_11M_MASK (1<<IWL_RATE_11M_INDEX)

/* 3945 uCode API values for (legacy) bit rates, both OFDM and CCK */
enum {
IWL_RATE_6M_PLCP = 13,
IWL_RATE_9M_PLCP = 15,
Expand All @@ -111,6 +115,7 @@ enum {
IWL_RATE_11M_PLCP = 110,
};

/* MAC header values for bit rates */
enum {
IWL_RATE_6M_IEEE = 12,
IWL_RATE_9M_IEEE = 18,
Expand Down
5 changes: 4 additions & 1 deletion trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ struct iwl4965_rate_info {
u8 next_rs_tgg; /* next rate used in TGG rs algo */
};

/* For driver (not uCode API) */
/*
* These serve as indexes into
* struct iwl4965_rate_info iwl4965_rates[IWL_RATE_COUNT];
*/
enum {
IWL_RATE_1M_INDEX = 0,
IWL_RATE_2M_INDEX,
Expand Down
Loading

0 comments on commit 208e1a6

Please sign in to comment.