evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rtlwifi: rtl8821ae: Fix an expression that is always false

Browse source 
In routine _rtl8821ae_set_media_status(), an incorrect mask results in a test
for AP status to always be false. Similar bugs were fixed in rtl8192cu and
rtl8192de, but this instance was missed at that time.

Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org> [3.18+]
Cc: David Binderman <dcb314@hotmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Larry Finger 2015-07-08 10:18:50 -05:00 • committed by Kalle Valo
parent cae761b5a6
commit 251086f588
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
View file

@ -2180,7 +2180,7 @@ static int _rtl8821ae_set_media_status(struct ieee80211_hw *hw,
rtl_write_byte(rtlpriv, MSR, bt_msr); rtl_write_byte(rtlpriv, MSR, bt_msr);
rtlpriv->cfg->ops->led_control(hw, ledaction); rtlpriv->cfg->ops->led_control(hw, ledaction);
if ((bt_msr & 0xfc) == MSR_AP) if ((bt_msr & MSR_MASK) == MSR_AP)
rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00); rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
else else
rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66); rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);

1
drivers/net/wireless/rtlwifi/rtl8821ae/reg.h
View file

@ -429,6 +429,7 @@
#define MSR_ADHOC 0x01 #define MSR_ADHOC 0x01
#define MSR_INFRA 0x02 #define MSR_INFRA 0x02
#define MSR_AP 0x03 #define MSR_AP 0x03
#define MSR_MASK 0x03
#define RRSR_RSC_OFFSET 21 #define RRSR_RSC_OFFSET 21
#define RRSR_SHORT_OFFSET 23 #define RRSR_SHORT_OFFSET 23