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

Commit e51048cd authored by Peter Wu's avatar Peter Wu Committed by John W. Linville
Browse files

rtlwifi: avoid accessing RCR directly 



The rtl*_set_check_bssid functions are mostly the same, but access the
RCR register in different ways. Use the get_hw_reg abstraction layer
(which reads rtlpci->receive_config for PCI devices and mac->rx_conf for
USB).

There is no functional change for cases where receive_config was
accessed directly. For rtl8192ce, there is still no change because
nothing modifies REG_RCR or receive_config. For rtl8192cu, it now also
applies changes to rx_conf from configure_filter, but that can be
considered a bug which is fixed later.

Signed-off-by: default avatarPeter Wu <lekensteyn@gmail.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c42c65c1

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

+3 −2
Original line number Diff line number Diff line
@@ -1235,12 +1235,13 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw, 
void rtl88ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

	u32 reg_rcr = rtlpci->receive_config;

	u32 reg_rcr;



	if (rtlpriv->psc.rfpwr_state != ERFON)

		return;



	rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));



	if (check_bssid == true) {

		reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);

		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,

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

+3 −1
Original line number Diff line number Diff line
@@ -1200,11 +1200,13 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw, 
void rtl92ce_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u32 reg_rcr = rtl_read_dword(rtlpriv, REG_RCR);

	u32 reg_rcr;



	if (rtlpriv->psc.rfpwr_state != ERFON)

		return;



	rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));



	if (check_bssid) {

		reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);

		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,

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

+3 −1
Original line number Diff line number Diff line
@@ -1379,11 +1379,13 @@ void rtl92cu_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);

	u32 reg_rcr = rtl_read_dword(rtlpriv, REG_RCR);

	u32 reg_rcr;



	if (rtlpriv->psc.rfpwr_state != ERFON)

		return;



	rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));



	if (check_bssid) {

		u8 tmp;

		if (IS_NORMAL_CHIP(rtlhal->version)) {

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

+4 −2
Original line number Diff line number Diff line
@@ -1138,11 +1138,13 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw, 
void rtl92de_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

	u32 reg_rcr = rtlpci->receive_config;

	u32 reg_rcr;



	if (rtlpriv->psc.rfpwr_state != ERFON)

		return;



	rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));



	if (check_bssid) {

		reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);

		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));

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

+3 −2
Original line number Diff line number Diff line
@@ -1135,12 +1135,13 @@ void rtl92se_set_mac_addr(struct rtl_io *io, const u8 *addr) 
void rtl92se_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

	u32 reg_rcr = rtlpci->receive_config;

	u32 reg_rcr;



	if (rtlpriv->psc.rfpwr_state != ERFON)

		return;



	rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));



	if (check_bssid) {

		reg_rcr |= (RCR_CBSSID);

		rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));