Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 965ec741 authored by Rickard Strandqvist's avatar Rickard Strandqvist Committed by John W. Linville
Browse files

rtlwifi/rtl8192c[eu]: 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: default avatarRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: default avatarPeter Wu <peter@lekensteyn.nl>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8a607208

drivers/net/wireless/rtlwifi/rtl8192ce/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw, 


	rtl_write_byte(rtlpriv, (MSR), bt_msr);

	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);

	else

		rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);

drivers/net/wireless/rtlwifi/rtl8192ce/reg.h

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ 
#define	MSR_ADHOC				0x01

#define	MSR_INFRA				0x02

#define	MSR_AP					0x03

#define	MSR_MASK				0x03



#define	RRSR_RSC_OFFSET				21

#define	RRSR_SHORT_OFFSET			23

drivers/net/wireless/rtlwifi/rtl8192cu/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ static int _rtl92cu_set_media_status(struct ieee80211_hw *hw, 
	}

	rtl_write_byte(rtlpriv, (MSR), bt_msr);

	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);

	else

		rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66);