Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4580964pxv; Tue, 6 Jul 2021 04:34:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTN+yqUkZSwyrGEG9cCPh6ODodJ3sg1t3i8Dvydh2mKM1+qImuqSq9nbLOmMz55Hucq9kI X-Received: by 2002:a17:907:990f:: with SMTP id ka15mr18168572ejc.132.1625571258030; Tue, 06 Jul 2021 04:34:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625571258; cv=none; d=google.com; s=arc-20160816; b=AWg3gdBlvtaRQL0bmRYYjuDtsyjJWyiBBWeqs9IudHsLIYl7YeqUALKQOdTesNJmR9 fHlfAexMz4Ve5vhytKBjg2/IJXKwSU3dk1kQ0N4icxYW0MdlXLN0OEpYp/5oD7AmU8Vv kf5Y5WDjJflQtSdzO5cfJh3fnDpZNNQTON55ViifdzZogQJLxvPYFqxnbBktq3UJV5// j4hGAtOW4msA8UzWhzBipaSlcEGyZnjV+6wJ3meUXCK7FGhHJ7qUYgYTjDKWsMPzOO7j 3OdaqxbcyJ8PPOwdMUeMXj8GQSb122BvD0nJDjRcBWZU3WH3DO3HAmfwkL+sgIEx7nC5 z/uw== 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=QRB6gDULvir7QXNqf09LZkRQCfATtMZs6IIFS+q22Mk=; b=SBR6Cjf1W3J2sq4f3ZXoDkHqJspu0yA08aoh87+2tRKTOeq3S8zU+PqL22kHdPrb04 /UuXD5jaJ9X5yjkSj0grnFscsFDt/RUTAZV+/YpjhoAzY26uNcVo06PsXY2Y5sEjIf40 eUDpE631YjNG8BbDq1atd0eo8XPcYVKWoYQYSrVWe5PKNM1WpfMabwj5TSAO8mr8IUfy GW1BbpXMriet7Ik86M7ncOisJLOPvRQCkCsVRrh3hAmbVA+4uXj+VMbmY6JWgvQk8Dt8 cEdsXizMG6bMwzCxGJRVmLWMYudNV5MxKhb+bExKmPHDFnnYHWBIMFEQF/fNF3Did3uQ ZioA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TaMWEnGr; 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 yl16si14042350ejb.352.2021.07.06.04.33.54; Tue, 06 Jul 2021 04:34:18 -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=TaMWEnGr; 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 S235605AbhGFLeV (ORCPT + 99 others); Tue, 6 Jul 2021 07:34:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:42644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235597AbhGFLaN (ORCPT ); Tue, 6 Jul 2021 07:30:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 65D6B61DC5; Tue, 6 Jul 2021 11:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570486; bh=V+HbKc4x6+LAJEgQTouvuy37V+Np+L0h/aB3oMk1irI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TaMWEnGr3DByHkZbmep9X0shCHn41AW7WYgIuJZC0A0zHFzO92Ld1wQKf63Ua/EL3 CTFKHZuyZ3ZkhsPEtVFfMdGISv3AJohwJYSAT5wseIVxVNdHyMxl+GyINfAspVtSoc 1UwLTL0jyQLf3Mi/9uJnBzqgmL5GBd60v7BgtlpkrMZxfqcxQPB0C/YBg+rxVbRwGb snuzSZr3sNnRz3QAUD0wTtoWVoMXWWDwF//e/SUdn+Z2mVJ1cQ2jIFzvEI0EYd/rGc 2p/l+Hqt7ldBLb9xbqilwp+xIoAOrgOPwbDwfdvEKp5L7zOx4CzvjECURG8fKwtS1u uKW4m/3ON+LyA== 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.12 133/160] cfg80211: fix default HE tx bitrate mask in 2G band Date: Tue, 6 Jul 2021 07:17:59 -0400 Message-Id: <20210706111827.2060499-133-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111827.2060499-1-sashal@kernel.org> References: <20210706111827.2060499-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 a5224da63832..be0f616f85d3 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4779,11 +4779,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