Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp2339857rwd; Fri, 2 Jun 2023 08:08:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6dtnf/X0/LcIY/tFhUuVRkiFk3igh9BDLlOv0SjvFs/jL9RQiETjMF7u78lT/SS1brVg3J X-Received: by 2002:a05:6a00:aca:b0:64b:43d8:a57d with SMTP id c10-20020a056a000aca00b0064b43d8a57dmr10890040pfl.13.1685718500170; Fri, 02 Jun 2023 08:08:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685718500; cv=none; d=google.com; s=arc-20160816; b=qg8AB4qlSx0l+5sxw4OvNCj16OVznuhPU2od00Nd230sXv1AnvctlwEh0CZbv4LInL y+p0G9GIt6ImtW6H5TcxGgILOI3MMXEm9lZqk+LIfnPxceL0hAJi+4UkNu0JeEpj5qKr 3kieLkC5qiejun1ydSfyqB9C9b7uBtQRAQceff6IYbpwBTiK3Fcww/EbBnm+UwYq3vZZ kt3tXurrRDpKg5WC8BJ4VAz3LAuDXCcdacamMkNOyeGHo09EVf28Bvu7981xMGVU6ThG SmWLS6WEB1cn+NQ/godgWfD0RjgzIWXfU3OpIZwvMOTN24dP/zUpGqUaR/Nq++KK3ify 7jQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :authenticated-by; bh=mngnPCO5tyvT4n96lxIsM85/qZ2cJTmhw3eGIWFjnzM=; b=wZIIFEZP2jSKFqIa4b0zzF2QFEqLTRmJMbl6eZB59APL4cUA4eVpvmHg0W5IwGBZlf CySBsyslMVWq1LA8LAdOCbCpWvhjTp7B6g2f+tOhZp0+bDXvj6SgCDykJgzyQVh7LNxq KlHqOPW9eDVMJC5cDmM9u7p11AaQRXE2APqOOqDupz5IKfiI/YPxebTD1xpfFj7TCT1P q5+XyvAiMRMGGtOf+CyDrCMRM7kucvPa8PT0drGMfdqpMV8AfPox5ebdv2r0TTOL7JQZ t0GvpiDcPWXV3PUD7XuFfNZSvcSHsAZY9TgReN0gzfpWPIsggjspRcts3eUXR9xoQ/Uc FMlw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o28-20020a637e5c000000b0051b47fe799fsi1096422pgn.557.2023.06.02.08.08.04; Fri, 02 Jun 2023 08:08:20 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236236AbjFBPGi (ORCPT + 64 others); Fri, 2 Jun 2023 11:06:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235248AbjFBPGf (ORCPT ); Fri, 2 Jun 2023 11:06:35 -0400 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A1341BD for ; Fri, 2 Jun 2023 08:06:31 -0700 (PDT) Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.77 with qID 352F69Sq8004575, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/2.81/5.90) with ESMTPS id 352F69Sq8004575 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK); Fri, 2 Jun 2023 23:06:09 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Fri, 2 Jun 2023 23:06:23 +0800 Received: from [127.0.1.1] (172.16.22.87) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Fri, 2 Jun 2023 23:06:23 +0800 From: Ping-Ke Shih To: CC: , Subject: [PATCH 1/8] wifi: rtw89: refine clearing supported bands to check 2/5 GHz first Date: Fri, 2 Jun 2023 23:05:49 +0800 Message-ID: <20230602150556.36777-2-pkshih@realtek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230602150556.36777-1-pkshih@realtek.com> References: <20230602150556.36777-1-pkshih@realtek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [172.16.22.87] X-ClientProxiedBy: RTEXMBS02.realtek.com.tw (172.21.6.95) To RTEXMBS04.realtek.com.tw (172.21.6.97) X-KSE-ServerInfo: RTEXMBS04.realtek.com.tw, 9 X-KSE-AntiSpam-Interceptor-Info: fallback X-KSE-Antivirus-Interceptor-Info: fallback X-KSE-AntiSpam-Interceptor-Info: fallback X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: Zong-Zhe Yang We refine to check if supported bands of NL80211_BAND_2GHZ and NL80211_BAND_5GHZ exist before freeing their iftype_data. For now, it does not really encounter problems because all current chips support both 2 GHz and 5 GHz. But, driver actually allows chips to declare whether 2/5 GHz are supported or not. In case some future chips really don't support them, we refine this code. Signed-off-by: Zong-Zhe Yang Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index 101047686fffb..1f841dcba0f03 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -3390,8 +3390,10 @@ static void rtw89_core_clr_supported_band(struct rtw89_dev *rtwdev) { struct ieee80211_hw *hw = rtwdev->hw; - kfree(hw->wiphy->bands[NL80211_BAND_2GHZ]->iftype_data); - kfree(hw->wiphy->bands[NL80211_BAND_5GHZ]->iftype_data); + if (hw->wiphy->bands[NL80211_BAND_2GHZ]) + kfree(hw->wiphy->bands[NL80211_BAND_2GHZ]->iftype_data); + if (hw->wiphy->bands[NL80211_BAND_5GHZ]) + kfree(hw->wiphy->bands[NL80211_BAND_5GHZ]->iftype_data); if (hw->wiphy->bands[NL80211_BAND_6GHZ]) kfree(hw->wiphy->bands[NL80211_BAND_6GHZ]->iftype_data); kfree(hw->wiphy->bands[NL80211_BAND_2GHZ]); -- 2.25.1