2020-02-07 08:49:38

by Tony Chuang

Subject: [PATCH v3] rtw88: Fix incorrect beamformee role setting

From: Tzu-En Huang <[email protected]>

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: Tzu-En Huang <[email protected]>
Signed-off-by: Yan-Hsuan Chuang <[email protected]>
---

v1 -> v2
* cannot put bfee->role = RTW_BFEE_NONE after out_unlock
put it enclosed by else

v2 -> v3
* remove unnecessary 'else' statement

drivers/net/wireless/realtek/rtw88/bf.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/bf.c b/drivers/net/wireless/realtek/rtw88/bf.c
index fda771d23f71..b6d1d71f4d30 100644
--- a/drivers/net/wireless/realtek/rtw88/bf.c
+++ b/drivers/net/wireless/realtek/rtw88/bf.c
@@ -41,7 +41,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
struct ieee80211_sta_vht_cap *ic_vht_cap;
const u8 *bssid = bss_conf->bssid;
u32 sound_dim;
- u8 bfee_role = RTW_BFEE_NONE;
u8 i;

if (!(chip->band & RTW_BAND_5G))
@@ -67,7 +66,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
}

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->aid = bss_conf->aid;
bfinfo->bfer_mu_cnt++;
@@ -85,7 +84,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
sound_dim >>= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT;

ether_addr_copy(bfee->mac_addr, bssid);
- bfee_role = RTW_BFEE_SU;
+ bfee->role = RTW_BFEE_SU;
bfee->sound_dim = (u8)sound_dim;
bfee->g_id = 0;
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,
}

out_unlock:
- bfee->role = bfee_role;
rcu_read_unlock();
}

--
2.17.1

2020-02-07 09:30:52

by Chris Chiu

Subject: Re: [PATCH v3] rtw88: Fix incorrect beamformee role setting

On Fri, Feb 7, 2020 at 4:47 PM <[email protected]> wrote:
>
> From: Tzu-En Huang <[email protected]>
>
> 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: Tzu-En Huang <[email protected]>
> Signed-off-by: Yan-Hsuan Chuang <[email protected]>
> ---
Reviewed-by: Chris Chiu <[email protected]>

>
> v1 -> v2
> * cannot put bfee->role = RTW_BFEE_NONE after out_unlock
> put it enclosed by else
>
> v2 -> v3
> * remove unnecessary 'else' statement
>
> --
> 2.17.1
>

2020-02-13 10:08:28

by Kalle Valo

Subject: Re: [PATCH v3] rtw88: Fix incorrect beamformee role setting

<[email protected]> wrote:

> From: Tzu-En Huang <[email protected]>
>
> 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: Tzu-En Huang <[email protected]>
> Signed-off-by: Yan-Hsuan Chuang <[email protected]>
> Reviewed-by: Chris Chiu <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

aa7619a39ace rtw88: Fix incorrect beamformee role setting

--
https://patchwork.kernel.org/patch/11369973/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches