Stanislaw,
On Fri, 2011-01-28 at 07:47 -0800, Stanislaw Gruszka wrote:
> Only use IWL_RATE_COUNT_3945 in 3945 code.
>
> Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
> ---
> drivers/net/wireless/iwlwifi/iwl-3945.c | 5 ++---
> drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 1 +
> drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
> index 294221b..58213e7 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-3945.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
> @@ -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
> * in this running context */
> - rate_mask = IWL_RATES_MASK;
> -
> + rate_mask = IWL_RATES_MASK_3945;
>
> /* Set retry limit on DATA packets and Probe Responses*/
> if (ieee80211_is_probe_resp(fc))
> @@ -1650,7 +1649,7 @@ static int iwl3945_hw_reg_comp_txpower_temp(struct iwl_priv *priv)
> ref_temp);
>
> /* 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++) {
> int power_idx =
> ch_info->power_info[rate_index].base_power_index;
> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
> index 75e50d3..184828c 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
> @@ -213,6 +213,7 @@ enum {
> IWL_CCK_BASIC_RATES_MASK)
>
> #define IWL_RATES_MASK ((1 << IWL_RATE_COUNT) - 1)
> +#define IWL_RATES_MASK_3945 ((1 << IWL_RATE_COUNT_3945) - 1)
>
Why define 3945 in agn header file?
I understand iwl-agn-rs.h is include in iwl-dev.h, which is not the
right thing to do. but specify 3945 in agn header file make it even more
confuse.
Wey
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
