aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2015-07-08 11:18:50 -0400
committerKalle Valo <kvalo@codeaurora.org>2015-07-21 10:58:41 -0400
commit251086f588720277a6f5782020a648ce32c4e00b (patch)
tree8a0a2801942cb02bade5e98a568e62c28bfdc73e /drivers/net/wireless/rtlwifi
parentcae761b5a6bdc597ba476a040fdcd5b4bc559b85 (diff)
rtlwifi: rtl8821ae: Fix an expression that is always false
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>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8821ae/hw.c2
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8821ae/reg.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
index 3236d44b459d..b7f18e2155eb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
@@ -2180,7 +2180,7 @@ static int _rtl8821ae_set_media_status(struct ieee80211_hw *hw,
2180 2180
2181 rtl_write_byte(rtlpriv, MSR, bt_msr); 2181 rtl_write_byte(rtlpriv, MSR, bt_msr);
2182 rtlpriv->cfg->ops->led_control(hw, ledaction); 2182 rtlpriv->cfg->ops->led_control(hw, ledaction);
2183 if ((bt_msr & 0xfc) == MSR_AP) 2183 if ((bt_msr & MSR_MASK) == MSR_AP)
2184 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00); 2184 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00);
2185 else 2185 else
2186 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66); 2186 rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/reg.h b/drivers/net/wireless/rtlwifi/rtl8821ae/reg.h
index 53668fc8f23e..1d6110f9c1fb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/reg.h
@@ -429,6 +429,7 @@
429#define MSR_ADHOC 0x01 429#define MSR_ADHOC 0x01
430#define MSR_INFRA 0x02 430#define MSR_INFRA 0x02
431#define MSR_AP 0x03 431#define MSR_AP 0x03
432#define MSR_MASK 0x03
432 433
433#define RRSR_RSC_OFFSET 21 434#define RRSR_RSC_OFFSET 21
434#define RRSR_SHORT_OFFSET 23 435#define RRSR_SHORT_OFFSET 23