Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ryder Lee <ryder.lee@mediatek.com>
To:     Johannes Berg <johannes.berg@intel.com>
CC:     <linux-wireless@vger.kernel.org>,
        <linux-mediatek@lists.infradead.org>,
        Ryder Lee <ryder.lee@mediatek.com>
Subject: [PATCH] mac80211: adjust the replace_state of ieee80211_find_chanctx()
Date:   Sat, 19 Mar 2022 06:18:10 +0800
Message-ID: <40aabb3e10302f1d7da92b7a4eb46577d5ed8e05.1647641256.git.ryder.lee@mediatek.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

We observe that the condition of chanctx could not be back to
IEEE80211_CHANCTX_REPLACE_NONE occasionally while STA connection.

In this case the state could be IEEE80211_CHANCTX_REPLACE_OTHER, which
fails the check and then creates another chanctx that leads to the next
round of chan_switch failure in cfg80211_check_combinations().

So, modify state to just rule out IEEE80211_CHANCTX_WILL_BE_REPLACED.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
 net/mac80211/chan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index e26d42de14ec..604095ff7a5b 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -477,7 +477,7 @@ ieee80211_find_chanctx(struct ieee80211_local *local,
 	list_for_each_entry(ctx, &local->chanctx_list, list) {
 		const struct cfg80211_chan_def *compat;
 
-		if (ctx->replace_state != IEEE80211_CHANCTX_REPLACE_NONE)
+		if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED)
 			continue;
 
 		if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE)
-- 
2.29.2