diff options
author | Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> | 2014-06-23 18:00:22 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-06-25 15:40:34 -0400 |
commit | 1dabe76c348f9ced521e412b9bd63ee5ec4924fd (patch) | |
tree | 294d8667cc5d50822565e25718a80000b17987a0 | |
parent | 965ec74110011dbcb4e6a7059c7b4d31ee95c33a (diff) |
rtlwifi/rtl8188ee: Fix media status register mask
bt_msr & 0xfc will never match 0x3. Fix this by using a mask that actually matches the available types.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/reg.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c index b14cf5a10f44..d840ad7bdf65 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | |||
@@ -1231,7 +1231,7 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw, | |||
1231 | 1231 | ||
1232 | rtl_write_byte(rtlpriv, (MSR), bt_msr); | 1232 | rtl_write_byte(rtlpriv, (MSR), bt_msr); |
1233 | rtlpriv->cfg->ops->led_control(hw, ledaction); | 1233 | rtlpriv->cfg->ops->led_control(hw, ledaction); |
1234 | if ((bt_msr & 0xfc) == MSR_AP) | 1234 | if ((bt_msr & MSR_MASK) == MSR_AP) |
1235 | rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00); | 1235 | rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00); |
1236 | else | 1236 | else |
1237 | rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66); | 1237 | rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66); |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h index 7af85cfa8f87..cd7e7a527133 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/reg.h | |||
@@ -411,6 +411,7 @@ | |||
411 | #define MSR_ADHOC 0x01 | 411 | #define MSR_ADHOC 0x01 |
412 | #define MSR_INFRA 0x02 | 412 | #define MSR_INFRA 0x02 |
413 | #define MSR_AP 0x03 | 413 | #define MSR_AP 0x03 |
414 | #define MSR_MASK 0x03 | ||
414 | 415 | ||
415 | #define RRSR_RSC_OFFSET 21 | 416 | #define RRSR_RSC_OFFSET 21 |
416 | #define RRSR_SHORT_OFFSET 23 | 417 | #define RRSR_SHORT_OFFSET 23 |