On Mon, Oct 6, 2008 at 11:25 PM, John W. Linville
<linville@xxxxxxxxxxxxx> wrote:
> On Mon, Oct 06, 2008 at 04:05:31PM +0800, Zhu Yi wrote:
>> From: Tomas Winkler <tomas.winkler@xxxxxxxxx>
>>
>> This patch selects a valid antenna upon RS init. This solves a SYSASSERT
>> complaining that the driver is setting a non valid antenna in the LQ CMD.
>
> I suppose this is an accurate description, but I think you can do
> better. :-)
>
>> diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
>> index c1300fb..56a3f0c 100644
>> --- a/drivers/net/wireless/iwlwifi/iwl-5000.c
>> +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
>> @@ -811,10 +811,14 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
>>
>> switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) {
>> case CSR_HW_REV_TYPE_5100:
>> + priv->hw_params.tx_chains_num = 1;
>> + priv->hw_params.rx_chains_num = 2;
>> + priv->hw_params.valid_tx_ant = ANT_B;
>> + priv->hw_params.valid_rx_ant = ANT_AB;
>> + break;
>> case CSR_HW_REV_TYPE_5150:
>> priv->hw_params.tx_chains_num = 1;
>> priv->hw_params.rx_chains_num = 2;
>> - /* FIXME: move to ANT_A, ANT_B, ANT_C enum */
>> priv->hw_params.valid_tx_ant = ANT_A;
>> priv->hw_params.valid_rx_ant = ANT_AB;
>> break;
>
> Do you realize that both clauses are the same (i.e. there is no
> functional change)? How is this useful?
The change is tx_ant
>
>> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
>> index d148d73..bac91f1 100644
>> --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
>> +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
>> @@ -284,6 +284,16 @@ static inline u8 num_of_ant(u8 mask)
>> !!((mask) & ANT_C);
>> }
>>
>> +static inline u8 first_antenna(u8 mask)
>> +{
>> + if (mask & ANT_A)
>> + return ANT_A;
>> + if (mask & ANT_B)
>> + return ANT_B;
>> + return ANT_C;
>> +}
>> +
>> +
>> static inline u8 iwl4965_get_prev_ieee_rate(u8 rate_index)
>> {
>> u8 rate = iwl_rates[rate_index].prev_ieee;
>> diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
>> index 61797f3..f9efc0c 100644
>> --- a/drivers/net/wireless/iwlwifi/iwl-sta.c
>> +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
>> @@ -852,7 +852,7 @@ static void iwl_sta_init_lq(struct iwl_priv *priv, const u8 *addr, int is_ap)
>> struct iwl_link_quality_cmd link_cmd = {
>> .reserved1 = 0,
>> };
>> - u16 rate_flags;
>> + u32 rate_flags;
>>
>> /* Set up the rate scaling to start at selected rate, fall back
>> * all the way down to 1M in IEEE order, and then spin on 1M */
>> @@ -869,14 +869,16 @@ static void iwl_sta_init_lq(struct iwl_priv *priv, const u8 *addr, int is_ap)
>> rate_flags |= RATE_MCS_CCK_MSK;
>>
>> /* Use Tx antenna B only */
>> - rate_flags |= RATE_MCS_ANT_B_MSK; /*FIXME:RS*/
>> + rate_flags |= first_antenna(priv->hw_params.valid_tx_ant) <<
>> + RATE_MCS_ANT_POS;
>
> You need to change the comment...
Right
> John
> --
> John W. Linville Linux should be at the core
> linville@xxxxxxxxxxxxx of your literate lifestyle.
> --
> 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
>
--
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
