aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8188ee/hw.c5
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192ce/hw.c4
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/hw.c4
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192de/hw.c6
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192se/hw.c5
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8723ae/hw.c5
6 files changed, 19 insertions, 10 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
index e06971be7df7..ce2226cd2e4f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
@@ -1235,12 +1235,13 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw,
1235void rtl88ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) 1235void rtl88ee_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
1236{ 1236{
1237 struct rtl_priv *rtlpriv = rtl_priv(hw); 1237 struct rtl_priv *rtlpriv = rtl_priv(hw);
1238 struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); 1238 u32 reg_rcr;
1239 u32 reg_rcr = rtlpci->receive_config;
1240 1239
1241 if (rtlpriv->psc.rfpwr_state != ERFON) 1240 if (rtlpriv->psc.rfpwr_state != ERFON)
1242 return; 1241 return;
1243 1242
1243 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
1244
1244 if (check_bssid == true) { 1245 if (check_bssid == true) {
1245 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN); 1246 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
1246 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, 1247 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index a82b30a1996c..25e178c80d70 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -1200,11 +1200,13 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
1200void rtl92ce_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) 1200void rtl92ce_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
1201{ 1201{
1202 struct rtl_priv *rtlpriv = rtl_priv(hw); 1202 struct rtl_priv *rtlpriv = rtl_priv(hw);
1203 u32 reg_rcr = rtl_read_dword(rtlpriv, REG_RCR); 1203 u32 reg_rcr;
1204 1204
1205 if (rtlpriv->psc.rfpwr_state != ERFON) 1205 if (rtlpriv->psc.rfpwr_state != ERFON)
1206 return; 1206 return;
1207 1207
1208 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
1209
1208 if (check_bssid) { 1210 if (check_bssid) {
1209 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN); 1211 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
1210 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, 1212 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 468bf73cc883..49ad10668078 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -1379,11 +1379,13 @@ void rtl92cu_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
1379{ 1379{
1380 struct rtl_priv *rtlpriv = rtl_priv(hw); 1380 struct rtl_priv *rtlpriv = rtl_priv(hw);
1381 struct rtl_hal *rtlhal = rtl_hal(rtlpriv); 1381 struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
1382 u32 reg_rcr = rtl_read_dword(rtlpriv, REG_RCR); 1382 u32 reg_rcr;
1383 1383
1384 if (rtlpriv->psc.rfpwr_state != ERFON) 1384 if (rtlpriv->psc.rfpwr_state != ERFON)
1385 return; 1385 return;
1386 1386
1387 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
1388
1387 if (check_bssid) { 1389 if (check_bssid) {
1388 u8 tmp; 1390 u8 tmp;
1389 if (IS_NORMAL_CHIP(rtlhal->version)) { 1391 if (IS_NORMAL_CHIP(rtlhal->version)) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index c4a7db9135d6..c16aa6b59527 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -1138,11 +1138,13 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw,
1138void rtl92de_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) 1138void rtl92de_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
1139{ 1139{
1140 struct rtl_priv *rtlpriv = rtl_priv(hw); 1140 struct rtl_priv *rtlpriv = rtl_priv(hw);
1141 struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); 1141 u32 reg_rcr;
1142 u32 reg_rcr = rtlpci->receive_config;
1143 1142
1144 if (rtlpriv->psc.rfpwr_state != ERFON) 1143 if (rtlpriv->psc.rfpwr_state != ERFON)
1145 return; 1144 return;
1145
1146 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
1147
1146 if (check_bssid) { 1148 if (check_bssid) {
1147 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN); 1149 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
1148 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr)); 1150 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index 4f461786a7eb..5aa39ef42eba 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -1135,12 +1135,13 @@ void rtl92se_set_mac_addr(struct rtl_io *io, const u8 *addr)
1135void rtl92se_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) 1135void rtl92se_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
1136{ 1136{
1137 struct rtl_priv *rtlpriv = rtl_priv(hw); 1137 struct rtl_priv *rtlpriv = rtl_priv(hw);
1138 struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); 1138 u32 reg_rcr;
1139 u32 reg_rcr = rtlpci->receive_config;
1140 1139
1141 if (rtlpriv->psc.rfpwr_state != ERFON) 1140 if (rtlpriv->psc.rfpwr_state != ERFON)
1142 return; 1141 return;
1143 1142
1143 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
1144
1144 if (check_bssid) { 1145 if (check_bssid) {
1145 reg_rcr |= (RCR_CBSSID); 1146 reg_rcr |= (RCR_CBSSID);
1146 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr)); 1147 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index c333dfd116b8..4680816f9597 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -1112,12 +1112,13 @@ static int _rtl8723ae_set_media_status(struct ieee80211_hw *hw,
1112void rtl8723ae_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) 1112void rtl8723ae_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
1113{ 1113{
1114 struct rtl_priv *rtlpriv = rtl_priv(hw); 1114 struct rtl_priv *rtlpriv = rtl_priv(hw);
1115 struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); 1115 u32 reg_rcr;
1116 u32 reg_rcr = rtlpci->receive_config;
1117 1116
1118 if (rtlpriv->psc.rfpwr_state != ERFON) 1117 if (rtlpriv->psc.rfpwr_state != ERFON)
1119 return; 1118 return;
1120 1119
1120 rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
1121
1121 if (check_bssid == true) { 1122 if (check_bssid == true) {
1122 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN); 1123 reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN);
1123 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, 1124 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-06 15:17:09 -0500