wifi: brcmfmac: cyw: set a unique cookie for mgmt tx
PATCH v2 1/1 wifi: brcmfmac: cyw: set a unique cookie for mgmt tx
Set cookie using an increasing atomic counter. Avoids mismatches of completion events later in brcmf_notify_mgmt_tx_status, where packet_id != vif->mgmt_tx_id is checked.
---
v2: split into separate patch and set cookie to atomic counter instead of packet_id directly.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +3 -1
@@ -23,6 +23,8 @@#define MGMT_AUTH_FRAME_DWELL_TIME 4000#define MGMT_AUTH_FRAME_WAIT_TIME (MGMT_AUTH_FRAME_DWELL_TIME + 100) +static atomic_t brcmf_cyw_mgmt_tx_id =ATOMIC_INIT (0 ); +static int brcmf_cyw_set_sae_pwd (struct brcmf_if *ifp,struct cfg80211_crypto_settings *crypto) {
@@ -123,7 +125,7 @@ int brcmf_cyw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,if (!ieee80211_is_auth (mgmt->frame_control))return brcmf_cfg80211_mgmt_tx (wiphy, wdev, params, cookie); - *cookie =0 ; + *cookie =atomic_inc_return (&brcmf_cyw_mgmt_tx_id); vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);reinit_completion (&vif->mgmt_tx);
Signature · 1 line
2.55.0
Arend van Spriel
maintainerQuoted 3 lines · Bogdan Nicolae
Set cookie using an increasing atomic counter. Avoids mismatches of completion events later in
brcmf_notify_mgmt_tx_status, wherepacket_id!=vif->mgmt_tx_idis checked.
Thanks for the split. I increased the scope and been looking in the cookie usage in the wireless subsystem. So I have a series lined up to change the cookie to an input parameter and have cfg80211 hand out the cookie value (it already has cfg80211_assign_cookie() function). This will also cover zero cookie fix here. So I would suggest to drop this patch and only let the PMKID patch go in.
Regards,
Arend
Sure, it sounds good. Thanks Arend.
Bogdan
Quoted 15 lines · Arend van Spriel
Quoted 3 lines · Bogdan Nicolae
Set cookie using an increasing atomic counter. Avoids mismatches of completion events later in
brcmf_notify_mgmt_tx_status, wherepacket_id!=vif->mgmt_tx_idis checked.Thanks for the split. I increased the scope and been looking in the cookie usage in the wireless subsystem. So I have a series lined up to change the cookie to an input parameter and have cfg80211 hand out the cookie value (it already has
cfg80211_assign_cookie()function). This will also cover zero cookie fix here. So I would suggest to drop this patch and only let the PMKID patch go in.Regards,
Arend
Arend van Spriel
maintainerQuoted 8 lines · Bogdan Nicolae
Set cookie using an increasing atomic counter. Avoids mismatches of completion events later in
brcmf_notify_mgmt_tx_status, wherepacket_id!=vif->mgmt_tx_idis checked.Signed-off-by Bogdan Nicolae <[email protected]>--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
As agreed I will mark this as superseded.
Regards,
Arend