Subject: Re: [PATCH 1/2 3.18] rtlwifi: rtl8821ae: Fix 5G detection problem

From: "John W. Linville" <[email-masked]>
Date: Tue, 25 Nov 2014 13:46:25 -0500

On Tue, Nov 25, 2014 at 10:32:06AM -0600, Larry Finger wrote:
> The changes associated with moving this driver from staging to the regular
> tree missed one section setting the allowable rates for the 5GHz band.
> 
> This patch is needed to fix the regression reported in Bug #88811
> (https://bugzilla.kernel.org/show_bug.cgi?id=88811).
> 
> Reported-by: Valerio Passini <[email-masked]>
> Tested-by: Valerio Passini <[email-masked]>
> Signed-off-by: Larry Finger <[email-masked]>
> Cc: Valerio Passini <[email-masked]>
> ---
>  drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
> index 310d316..18f34f7 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
> @@ -3672,8 +3672,9 @@ static void rtl8821ae_update_hal_rate_mask(struct ieee80211_hw *hw,
>  		mac->opmode == NL80211_IFTYPE_ADHOC)
>  		macid = sta->aid + 1;
>  	if (wirelessmode == WIRELESS_MODE_N_5G ||
> -	    wirelessmode == WIRELESS_MODE_AC_5G)
> -		ratr_bitmap = sta->supp_rates[NL80211_BAND_5GHZ];
> +	    wirelessmode == WIRELESS_MODE_AC_5G ||
> +	    wirelessmode == WIRELESS_MODE_A)
> +		ratr_bitmap = (sta->supp_rates[NL80211_BAND_5GHZ])<<4;

The parenthesis seem superfluous.  How about this line instead?

+		ratr_bitmap = sta->supp_rates[NL80211_BAND_5GHZ] << 4;

>  	else
>  		ratr_bitmap = sta->supp_rates[NL80211_BAND_2GHZ];
>  
> -- 
> 2.1.2
> 
> 

-- 
John W. Linville		Someday the world will need a hero, and you
[email-masked]			might be all we have.  Be ready.