Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp96076rwr; Wed, 3 May 2023 23:15:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4w5kFVUs8jp4OtQUoH2eFg4Hml/dG88FB3J98/C6qbzGBp857gqsB/n/f/xuMGqDO5cHLW X-Received: by 2002:a17:90b:1bc5:b0:23c:fef0:d441 with SMTP id oa5-20020a17090b1bc500b0023cfef0d441mr1159033pjb.33.1683180957831; Wed, 03 May 2023 23:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683180957; cv=none; d=google.com; s=arc-20160816; b=IvHlTo5Y/jtrEWMzm0jz6YDwxNTF7Ct0GipNEYvJ6jsxq1UEPjy37PRxrQb1Mz6VJ1 38zp/9GSYQij3mnR/AaQhQcRch8apyAUco9QP+EMNXGvSSyHWnunH4kRuF3fbi4SxgT+ WPxd7PXibEWTfsVnuskNEmh9pcNIpoBQtpHmG0PA8BgoqHDl05zdU9D2I+qvGZZ0FlOp X08Ux97BrZnYps+dYhaPQznrr2qaH9s+pyzBigU5dZP8NSijM411CYhaCF5NMduAOPH4 74lnGmR45/vGDjsbRvHa69zdAuREyXaR+vJjrSfndNgQDLYNlbs1cK3NEDZBDH0XmT4r xsIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :dkim-signature; bh=rE5QWu/n8ZRnDtPZT8J8qeDTGPZL1saLvA8Wwnaqr7U=; b=XhDZLwE6qwBiGEK2Wl0YkDxkwHtHtQ9hy/2pkd7FuOhtvQu4Wo8ljDdezDRrossY7i xjZobOJEXDIEROpaG/tSZyGUavB+nzUkB4nNyKjVlBRmdim1wk/XQE9KxeaCT03qeRh4 hBvHaGBSIgQZwaUTRvBnOgZ4EVlWb2y6jPJcPD1SQHKiHp47clCJt6+Z5NbdPDfE3Bmm dg4s5UM37kc1maVYvg3oNxD4xuOxwMY5teXlgSJiwmBfJqmeaHGyckYADse++wzgl8Yv hWS1HE+3bMKiHpZgayDr0W5AYGQg0SXEko1JSdZhNixqMnFn98Q6L+H9mZx2NsKjlUbd Fjvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=XCQffrA3; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b20-20020a631b14000000b0051f0d230ec5si31304822pgb.708.2023.05.03.23.15.17; Wed, 03 May 2023 23:15:57 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=XCQffrA3; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229688AbjEDGLX (ORCPT + 62 others); Thu, 4 May 2023 02:11:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229601AbjEDGLW (ORCPT ); Thu, 4 May 2023 02:11:22 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 693762122 for ; Wed, 3 May 2023 23:11:09 -0700 (PDT) X-UUID: 7243051aea4211edb20a276fd37b9834-20230504 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=rE5QWu/n8ZRnDtPZT8J8qeDTGPZL1saLvA8Wwnaqr7U=; b=XCQffrA3kAgpJF4b80ww1kEGYE5IYyZSdmQxvHaOx6/5e5YPHuOBYPG9ulViHbiGYJr9ku4aDhdMY9R9KA7cTZQsdTYtN6IarhD/lpSw6UAtEe4aaGFLUsLuPgPYC+YfCuWOA3pxvgmPxmU69U3lH+TYYvTBPMhiY3exlqZv++k=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.23,REQID:138cbd20-a922-4c79-990c-294eef2ed037,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:697ab71,CLOUDID:8d02b330-6935-4eab-a959-f84f8da15543,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-UUID: 7243051aea4211edb20a276fd37b9834-20230504 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1810692553; Thu, 04 May 2023 14:11:02 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Thu, 4 May 2023 14:11:01 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Thu, 4 May 2023 14:11:01 +0800 From: Michael-CY Lee To: linux-wireless CC: Johannes Berg , Felix Fietkau , Lorenzo Bianconi , Evelyn Tsai , Money Wang , linux-mediatek , Michael-CY Lee Subject: [PATCH] wifi: mac80211: Abort running CCA when stopping AP Date: Thu, 4 May 2023 14:10:49 +0800 Message-ID: <20230504061049.21082-1-michael-cy.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_TEMPERROR,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Michael Lee Signed-off-by: Michael Lee --- net/mac80211/cfg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 343ce2b..e6df30d 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1537,9 +1537,10 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev, sdata_dereference(link->u.ap.unsol_bcast_probe_resp, sdata); - /* abort any running channel switch */ + /* abort any running channel switch or color change */ mutex_lock(&local->mtx); link_conf->csa_active = false; + link_conf->color_change_active = false; if (link->csa_block_tx) { ieee80211_wake_vif_queues(local, sdata, IEEE80211_QUEUE_STOP_REASON_CSA); -- 2.25.1