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

Commit e480e134 authored by Taehee Yoo's avatar Taehee Yoo Committed by Kalle Valo
Browse files

rtlwifi: Change REG_CR+2 to MSR 



I changed REG_CR+2 and (MSR) to MSR because MSR is defined as (REG_CR + 2).

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 01fbd4ec

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

+2 −2
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw) 


	rtl_write_word(rtlpriv, REG_CR, 0x2ff);

	rtl_write_byte(rtlpriv, REG_CR+1, 0x06);

	rtl_write_byte(rtlpriv, REG_CR+2, 0x00);

	rtl_write_byte(rtlpriv, MSR, 0x00);



	if (!rtlhal->mac_func_enable) {

		if (_rtl88ee_llt_table_init(hw) == false) {
@@ -1278,7 +1278,7 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw, 
			 mode);

	}



	rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);

	rtl_write_byte(rtlpriv, MSR, bt_msr | mode);

	rtlpriv->cfg->ops->led_control(hw, ledaction);

	if (mode == MSR_AP)

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ static int _rtl92cu_set_media_status(struct ieee80211_hw *hw, 
			 "Network type %d not supported!\n", type);

		goto error_out;

	}

	rtl_write_byte(rtlpriv, (MSR), bt_msr);

	rtl_write_byte(rtlpriv, MSR, bt_msr);

	rtlpriv->cfg->ops->led_control(hw, ledaction);

	if ((bt_msr & MSR_MASK) == MSR_AP)

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

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

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ int rtl92c_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type) 
			 "Network type %d not supported!\n", type);

		return -EOPNOTSUPP;

	}

	rtl_write_byte(rtlpriv, (REG_CR + 2), value);

	rtl_write_byte(rtlpriv, MSR, value);

	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw, 
		break;



	}

	rtl_write_byte(rtlpriv, REG_CR + 2, bt_msr);

	rtl_write_byte(rtlpriv, MSR, bt_msr);

	rtlpriv->cfg->ops->led_control(hw, ledaction);

	if ((bt_msr & MSR_MASK) == MSR_AP)

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ static int _rtl92ee_set_media_status(struct ieee80211_hw *hw, 
			 mode);

	}



	rtl_write_byte(rtlpriv, (MSR), bt_msr | mode);

	rtl_write_byte(rtlpriv, MSR, bt_msr | mode);

	rtlpriv->cfg->ops->led_control(hw, ledaction);

	if (mode == MSR_AP)

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