Commit aa7619a3 authored by Tzu-En Huang's avatar Tzu-En Huang Committed by Kalle Valo

rtw88: Fix incorrect beamformee role setting

In associating and configuring beamformee, bfee->role is not
correctly set before rtw_chip_ops::config_bfee().
Fix it by setting it correctly.
Signed-off-by: default avatarTzu-En Huang <tehuang@realtek.com>
Signed-off-by: default avatarYan-Hsuan Chuang <yhchuang@realtek.com>
Reviewed-by: default avatarChris Chiu <chiu@endlessm.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d49f2c50
...@@ -41,7 +41,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, ...@@ -41,7 +41,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
struct ieee80211_sta_vht_cap *ic_vht_cap; struct ieee80211_sta_vht_cap *ic_vht_cap;
const u8 *bssid = bss_conf->bssid; const u8 *bssid = bss_conf->bssid;
u32 sound_dim; u32 sound_dim;
u8 bfee_role = RTW_BFEE_NONE;
u8 i; u8 i;
if (!(chip->band & RTW_BAND_5G)) if (!(chip->band & RTW_BAND_5G))
...@@ -67,7 +66,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, ...@@ -67,7 +66,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
} }
ether_addr_copy(bfee->mac_addr, bssid); ether_addr_copy(bfee->mac_addr, bssid);
bfee_role = RTW_BFEE_MU; bfee->role = RTW_BFEE_MU;
bfee->p_aid = (bssid[5] << 1) | (bssid[4] >> 7); bfee->p_aid = (bssid[5] << 1) | (bssid[4] >> 7);
bfee->aid = bss_conf->aid; bfee->aid = bss_conf->aid;
bfinfo->bfer_mu_cnt++; bfinfo->bfer_mu_cnt++;
...@@ -85,7 +84,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, ...@@ -85,7 +84,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
sound_dim >>= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT; sound_dim >>= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT;
ether_addr_copy(bfee->mac_addr, bssid); ether_addr_copy(bfee->mac_addr, bssid);
bfee_role = RTW_BFEE_SU; bfee->role = RTW_BFEE_SU;
bfee->sound_dim = (u8)sound_dim; bfee->sound_dim = (u8)sound_dim;
bfee->g_id = 0; bfee->g_id = 0;
bfee->p_aid = (bssid[5] << 1) | (bssid[4] >> 7); bfee->p_aid = (bssid[5] << 1) | (bssid[4] >> 7);
...@@ -102,7 +101,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, ...@@ -102,7 +101,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
} }
out_unlock: out_unlock:
bfee->role = bfee_role;
rcu_read_unlock(); rcu_read_unlock();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment