diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-05-15 01:54:02 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-21 21:47:56 -0400 |
commit | 1826dcc094466a39c82d4370ccfba694be0bc05b (patch) | |
tree | 6cbcd36daa8adb1723073940384d55dc249ffc59 /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
parent | fcab423d716f923d6a7601ba33adf356bef83414 (diff) |
iwlwifi: remove 4965 from iwl4965_rate_info
This patch removes 4965 from iwl4965_rate_info structure and
associated variables.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 1c45b6f49d56..edde8142c13e 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -878,9 +878,9 @@ static u8 iwl4965_rate_get_lowest_plcp(struct iwl_priv *priv) | |||
878 | 878 | ||
879 | /* Find lowest valid rate */ | 879 | /* Find lowest valid rate */ |
880 | for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID; | 880 | for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID; |
881 | i = iwl4965_rates[i].next_ieee) { | 881 | i = iwl_rates[i].next_ieee) { |
882 | if (rate_mask & (1 << i)) | 882 | if (rate_mask & (1 << i)) |
883 | return iwl4965_rates[i].plcp; | 883 | return iwl_rates[i].plcp; |
884 | } | 884 | } |
885 | 885 | ||
886 | /* No valid rate was found. Assign the lowest one */ | 886 | /* No valid rate was found. Assign the lowest one */ |
@@ -939,7 +939,7 @@ static u16 iwl4965_supported_rate_to_ie(u8 *ie, u16 supported_rate, | |||
939 | for (bit = 1, i = 0; i < IWL_RATE_COUNT; i++, bit <<= 1) { | 939 | for (bit = 1, i = 0; i < IWL_RATE_COUNT; i++, bit <<= 1) { |
940 | if (bit & supported_rate) { | 940 | if (bit & supported_rate) { |
941 | ret_rates |= bit; | 941 | ret_rates |= bit; |
942 | rates[*cnt] = iwl4965_rates[i].ieee | | 942 | rates[*cnt] = iwl_rates[i].ieee | |
943 | ((bit & basic_rate) ? 0x80 : 0x00); | 943 | ((bit & basic_rate) ? 0x80 : 0x00); |
944 | (*cnt)++; | 944 | (*cnt)++; |
945 | (*left)--; | 945 | (*left)--; |