Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4572184pxv; Tue, 6 Jul 2021 04:21:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8JeTEMV9w5aVMVPwjJOch/2YqViVFA/gMuCBs3u4nHCdguGN9wRDD3gd0qnD//3DGMe1G X-Received: by 2002:a17:907:9622:: with SMTP id gb34mr18219231ejc.401.1625570500693; Tue, 06 Jul 2021 04:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570500; cv=none; d=google.com; s=arc-20160816; b=VmutPwRfqCf3mRqNKVWKGy/n8gkONLbpO9zipyKb3cBOe9ykpF5pUvNHFQmdyZ1zsM lqHEXOuaMF3m3lPQ9LtraSby4IPNskJcysCSuc83laGPtq54/wJUIiO9Cfzbb/Lf6DN5 fUVa0lDpGZe7xob7m26XnbjTpw3r+ZFw7cO3zqybW0WkYrQwk5xZazT6o4D3ysTCIFhL nyqd2L6yIeOZg2xqynNOObt68a+V+zkr+ZeeNMzVaoQSrw0iuSwVryRhw8VO7stcGbkJ r5PAftUTouvRfiwoVnMvuJvVo8Db0CSz8WGbcGRZouQzT5vy2F8OtU/UR0WBAMnRpPZW 7dsQ== 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 :dkim-signature; bh=k44bUG+UvrTxoMV7syQYhnQGUr9u0qf25fy2CaannXE=; b=tUIoW2xn8aJTjlJA0aLRsAt2zh8G8aQoTXcz1hSJMhMCz8M3YXhq6V+q/cXBh0+cum +mJbL4reLEEeIf0pCrAs+FX/1bOYjF/uuPskCS/QrC56d8Lshogmsgfv0qhnsZdeJCM2 1PEf8miF2QvMwukOxvcFGOepGx0H1C6fMLfEHizyPNK+1vIJ80idCm7Ea0LyXktjhNNR 1Klw1LJCIX7OXMH1QsocA2E8EN3zwl7OW9UMWz/5InWMxzEZfOuq/ud+jl03qigd0JeG nm/sukSnzTcyZ2dcCV8fj+Z8Mzpy2PANx9AkBMYTtYWydO9KBNPOgjccMI5YdxiPpQTK 9zQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="o/CvIf0I"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h93si16603892edd.605.2021.07.06.04.21.17; Tue, 06 Jul 2021 04:21:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="o/CvIf0I"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232620AbhGFLXo (ORCPT + 99 others); Tue, 6 Jul 2021 07:23:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:56584 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233100AbhGFLVn (ORCPT ); Tue, 6 Jul 2021 07:21:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7D90F61CDA; Tue, 6 Jul 2021 11:17:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570266; bh=AEFMNni0q72L8/+5niW7zEZN13RimeOt/iWZevfRFVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o/CvIf0IaYzNfLyqT+gzRIUDQhMrmAcvIna9w2vhKnBM7x3wl1RwF4j/vUy90taj7 CkPbwAUMlv62PcUbvByfs8U2HF2t+EI30OPCbiGZu9C1cluksPdQGB/dy9+Pzqg/zO 6+tB4Ur5DnXVdK4sYRKoLyBz4kz2TGK87cXGtrzyqFgfkNWzWw30W3/zEYw4CDx2rm ZYHMczJO2mC28BSdGVURpzje7IoEupfBDbH69kE5TKRR9tzhUD3fGmyEci7A21BBx8 ase+kNo1WnynltLqKjAotYh3HQFtk1vezNALpjOaSHBT4nt5hZE5D3/pP0oqxt25fo corgHEur1eJdQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ping-Ke Shih , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 161/189] cfg80211: fix default HE tx bitrate mask in 2G band Date: Tue, 6 Jul 2021 07:13:41 -0400 Message-Id: <20210706111409.2058071-161-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ping-Ke Shih [ Upstream commit 9df66d5b9f45c39b3925d16e8947cc10009b186d ] In 2G band, a HE sta can only supports HT and HE, but not supports VHT. In this case, default HE tx bitrate mask isn't filled, when we use iw to set bitrates without any parameter. Signed-off-by: Ping-Ke Shih Link: https://lore.kernel.org/r/20210609075944.51130-1-pkshih@realtek.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index fc9286afe3c9..912977bf3ec8 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4781,11 +4781,10 @@ static int nl80211_parse_tx_bitrate_mask(struct genl_info *info, sband->ht_cap.mcs.rx_mask, sizeof(mask->control[i].ht_mcs)); - if (!sband->vht_cap.vht_supported) - continue; - - vht_tx_mcs_map = le16_to_cpu(sband->vht_cap.vht_mcs.tx_mcs_map); - vht_build_mcs_mask(vht_tx_mcs_map, mask->control[i].vht_mcs); + if (sband->vht_cap.vht_supported) { + vht_tx_mcs_map = le16_to_cpu(sband->vht_cap.vht_mcs.tx_mcs_map); + vht_build_mcs_mask(vht_tx_mcs_map, mask->control[i].vht_mcs); + } he_cap = ieee80211_get_he_iftype_cap(sband, wdev->iftype); if (!he_cap) -- 2.30.2