lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwl3945: do not use agn specific IWL_RATE_COUNT

Browse Source 
Only use IWL_RATE_COUNT_3945 in 3945 code.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stanislaw Gruszka
2011-01-28 16:47:49 +01:00
committed by John W. Linville
parent 3e11210d46
commit d828cd5a95
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/iwlwifi/iwl-3945.c
View File

@@ -762,8 +762,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,
/* We need to figure out how to get the sta->supp_rates while /* We need to figure out how to get the sta->supp_rates while
* in this running context */ * in this running context */
rate_mask = IWL_RATES_MASK; rate_mask = IWL_RATES_MASK_3945;
/* Set retry limit on DATA packets and Probe Responses*/ /* Set retry limit on DATA packets and Probe Responses*/
if (ieee80211_is_probe_resp(fc)) if (ieee80211_is_probe_resp(fc))
@@ -1650,7 +1649,7 @@ static int iwl3945_hw_reg_comp_txpower_temp(struct iwl_priv *priv)
ref_temp); ref_temp);
/* set tx power value for all rates, OFDM and CCK */ /* set tx power value for all rates, OFDM and CCK */
for (rate_index = 0; rate_index < IWL_RATE_COUNT; for (rate_index = 0; rate_index < IWL_RATE_COUNT_3945;
rate_index++) { rate_index++) {
int power_idx = int power_idx =
ch_info->power_info[rate_index].base_power_index; ch_info->power_info[rate_index].base_power_index;

1
drivers/net/wireless/iwlwifi/iwl-agn-rs.h
View File

@@ -213,6 +213,7 @@ enum {
IWL_CCK_BASIC_RATES_MASK) IWL_CCK_BASIC_RATES_MASK)
#define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1) #define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1)
#define IWL_RATES_MASK_3945 ((1 << IWL_RATE_COUNT_3945) - 1)
#define IWL_INVALID_VALUE -1 #define IWL_INVALID_VALUE -1

2
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@@ -2517,7 +2517,7 @@ static void iwl3945_alive_start(struct iwl_priv *priv)
ieee80211_wake_queues(priv->hw); ieee80211_wake_queues(priv->hw);
priv->active_rate = IWL_RATES_MASK; priv->active_rate = IWL_RATES_MASK_3945;
iwl_power_update_mode(priv, true); iwl_power_update_mode(priv, true);