diff options
| author | Arend van Spriel <arend.vanspriel@broadcom.com> | 2026-07-31 14:35:00 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2026-08-02 17:40:07 +0200 |
| commit | 70557cadc828cbfd17d79481f5bcfbace7dc648c (patch) | |
| tree | 17daaf8c62e7a17ef6fd1293b094b8041a205b6b | |
| parent | 5c4b13cb50cae52afb34d043b8599ff767135017 (diff) | |
| download | linux-next-70557cadc828cbfd17d79481f5bcfbace7dc648c.tar.gz linux-next-70557cadc828cbfd17d79481f5bcfbace7dc648c.zip | |
wifi: wil6210: use pre-assigned cookie for remain_on_channel, mgmt_tx and probe_peer
Stop overwriting the pre-assigned cookie in wil_p2p_listen(),
wil_cfg80211_mgmt_tx(), and wil_cfg80211_probe_peer().
For remain_on_channel, store the pre-assigned cookie in p2p->cookie
instead of incrementing it. All cancel and expiry callbacks already
read from p2p->cookie so they pick up the correct value.
For mgmt_tx, remove the defensive "cookie ? *cookie : 0" guard;
cfg80211 guarantees a non-NULL cookie pointer.
For probe_peer, store the pre-assigned cookie in req->cookie instead
of the CID value. The CID is still available via req->cid for STA
lookup in wil_probe_client_handle().
Assisted-by: Claude:claude-sonnet-4-6
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://patch.msgid.link/20260731123509.1975281-5-arend.vanspriel@broadcom.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/cfg80211.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/p2p.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c index 5f2bd9a31faf..6ebd340c8ef7 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@ -1488,8 +1488,7 @@ out: */ tx_status = (rc == 0); rc = (rc == -EAGAIN) ? 0 : rc; - cfg80211_mgmt_tx_status(wdev, cookie ? *cookie : 0, buf, len, - tx_status, GFP_KERNEL); + cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, tx_status, GFP_KERNEL); return rc; } @@ -2399,13 +2398,12 @@ static int wil_cfg80211_probe_peer(struct wiphy *wiphy, return -ENOMEM; req->cid = cid; - req->cookie = cid; + req->cookie = *cookie; mutex_lock(&vif->probe_client_mutex); list_add_tail(&req->list, &vif->probe_client_pending); mutex_unlock(&vif->probe_client_mutex); - *cookie = req->cookie; queue_work(wil->wq_service, &vif->probe_client_worker); return 0; } diff --git a/drivers/net/wireless/ath/wil6210/p2p.c b/drivers/net/wireless/ath/wil6210/p2p.c index f20caf1a3905..6d2cadca259f 100644 --- a/drivers/net/wireless/ath/wil6210/p2p.c +++ b/drivers/net/wireless/ath/wil6210/p2p.c @@ -144,7 +144,7 @@ int wil_p2p_listen(struct wil6210_priv *wil, struct wireless_dev *wdev, } memcpy(&p2p->listen_chan, chan, sizeof(*chan)); - *cookie = ++p2p->cookie; + p2p->cookie = *cookie; p2p->listen_duration = duration; mutex_lock(&wil->vif_mutex); |