Remain on channel must be removed after authentication is done.
Otherwise WMM setting for assoiation request will be removed.
Signed-off-by: David Lin <[email protected]>
---
drivers/net/wireless/marvell/mwifiex/cfg80211.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index a21310f3807c..b99de9f4ca14 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -4306,6 +4306,8 @@ mwifiex_cfg80211_authenticate(struct wiphy *wiphy,
if (!ret) {
priv->roc_cfg.cookie = get_random_u32() | 1;
priv->roc_cfg.chan = *req->bss->channel;
+ } else {
+ return -EFAULT;
}
}
@@ -4418,6 +4420,16 @@ mwifiex_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev,
if (priv->auth_flag && !(priv->auth_flag & HOST_MLME_AUTH_DONE))
return -EBUSY;
+ if (priv->roc_cfg.cookie) {
+ ret = mwifiex_remain_on_chan_cfg(priv, HostCmd_ACT_GEN_REMOVE,
+ &priv->roc_cfg.chan, 0);
+ if (!ret)
+ memset(&priv->roc_cfg, 0,
+ sizeof(struct mwifiex_roc_cfg));
+ else
+ return -EFAULT;
+ }
+
if (!mwifiex_stop_bg_scan(priv))
cfg80211_sched_scan_stopped_locked(priv->wdev.wiphy, 0);
--
2.25.1
On Tue, Nov 28, 2023 at 04:31:07PM +0800, David Lin wrote:
> Remain on channel must be removed after authentication is done.
> Otherwise WMM setting for assoiation request will be removed.
Same comment as patch 2, this seems a fixup of commit 1, you should fix
that patch, not add a followup fixup commit.
Francesco
> From: Francesco Dolcini <[email protected]>
> Sent: Friday, December 1, 2023 6:19 PM
> To: David Lin <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; [email protected]; [email protected]; Pete
> Hsieh <[email protected]>
> Subject: [EXT] Re: [PATCH v7 04/12] wifi: mwifiex: fixed missing WMM IE for
> assoc req.
>
> Caution: This is an external email. Please take care when clicking links or
> opening attachments. When in doubt, report the message using the 'Report
> this email' button
>
>
> On Tue, Nov 28, 2023 at 04:31:07PM +0800, David Lin wrote:
> > Remain on channel must be removed after authentication is done.
> > Otherwise WMM setting for assoiation request will be removed.
>
> Same comment as patch 2, this seems a fixup of commit 1, you should fix
> that patch, not add a followup fixup commit.
So you think patch 1 to 4 should be merged as a single patch? In fact, patch 2 to 4 is issues reported by our QA for patch 1. If you insisted merge all of them, I can do this for patch v8.
>
> Francesco