Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4581424pxv; Tue, 6 Jul 2021 04:34:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxdxMXdtB/4eoUL4tEXPwfB6OUOh2uhiogKzHyI6OkEbXcSgR1ReK9To3Kp7o97yynCnBvm X-Received: by 2002:a17:906:d552:: with SMTP id cr18mr14994625ejc.276.1625571298273; Tue, 06 Jul 2021 04:34:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625571298; cv=none; d=google.com; s=arc-20160816; b=VaAhqm86C2A22lH6VPMlHB/qC+wVppE3YhAIc54WuIsUyOoCNv15caDPTJ2Df3D59l 4k1+6kFUBgyXeIE/ih9afdZ0vqgwDbM3hHZVS6sGq1zcwRrgVfmHkRooAQlONXnWVTxQ 36qcwIqefaar0oS8IttXjIl6SVczK69momrERQevNbIpwVqwWrwxQ3KDDz780xrzxb9D oPYIyMqfSNuo9Yamz9whD2ERuD6ZTdP3djXYZr9SVdKdSpwICVz/nkQPrt8JS+YJyxpw dwE9rkLr+Hx6W3ySMuRn7Gk1OHORYlPFkn09fnqjWkMr/AhRhNLvhsUP+UpvIk4a0CnL n+SA== 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=K3Et/0qNB/dOUsJjiKjvSoPJBx8JN56m6dFQZTXFX0c=; b=ujsLZTAU496Ee/EsvY6CB6H6BUj3guGQPnuC+KeCF+nDKSks8o3O6uAQuO//8uDwRT +hNcMH4yg8wMohKtmE0ppEC0Dyl21lvQVdSE50hJz7aATLTkwEu9B4uLoVwir/oAu4t7 h6DEZIW/XpmmP2CLPvu6tUTW0sHsiq0peUiYomXf0Fn0w6kxAuTIHy/mHDOVMbZQcEpI +6U+9rxqVsjP3Zn4nfrc40r5oKZ+DMinjbFkp7TnDmOjnj7lt9ly3ZdfaCaUhK8PTdN7 ut8jFZbyBbhmhEKHyKbyAuZ+NiJ55mXCrhHpbNeYj4qjNuxgovixXVLd+wCyUZdgeWlm 1vpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vOQVM3nr; 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 y18si14032949edt.384.2021.07.06.04.34.35; Tue, 06 Jul 2021 04:34:58 -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=vOQVM3nr; 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 S233333AbhGFLg3 (ORCPT + 99 others); Tue, 6 Jul 2021 07:36:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:47548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236744AbhGFLfj (ORCPT ); Tue, 6 Jul 2021 07:35:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 92DDA61E1A; Tue, 6 Jul 2021 11:24:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570649; bh=ZxhQ/s8KZpLwV9wFhgLlnsSd4+04GTiheMdXUWADhsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vOQVM3nrbqpkXwyxTrR7xomE7wnW1DTa7CqC2OnX7HY/jyLa4ezfbeiG5bW5GTBAj ZA4H+GuFZRZAP/8kQNNz/bHtbyNVZlp9K3P0ya8lq+liTcyPBuOzsRfo4eR2O+rMA0 2M21KAab8ifZRPm/P60CA5vShO2WjdFr3jP9hJb2EUlNqDzPZi/JBGaVEfZjfePJ8Q E8DJguI3AyA3+Id4mr4f4eqqbR1a6tZcXaycQrjyI1NpxWwfGk/oKznKwdl9ImuBJ+ w2i5smrIn0+V60zi+80JzJzyaV7TejFpZE6PJ8kw+AayREL8gqCwTIVvO6z8a7nR7O +UHCI/XdHBPvg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ryder Lee , Felix Fietkau , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.10 097/137] mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode Date: Tue, 6 Jul 2021 07:21:23 -0400 Message-Id: <20210706112203.2062605-97-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706112203.2062605-1-sashal@kernel.org> References: <20210706112203.2062605-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: Ryder Lee [ Upstream commit 2707ff4dd7b1479dbd44ebb3c74788084cc95245 ] The value of station mode is always 0. Fixed: 00b2e16e0063 ("mt76: mt7915: add TxBF capabilities") Signed-off-by: Ryder Lee Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c index 0232b66acb4f..8f01ca1694bc 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c @@ -335,6 +335,9 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap, if (nss < 2) return; + /* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */ + elem->phy_cap_info[7] |= min_t(int, nss - 1, 2) << 3; + if (vif != NL80211_IFTYPE_AP) return; @@ -348,9 +351,6 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap, c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB | IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB; elem->phy_cap_info[6] |= c; - - /* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */ - elem->phy_cap_info[7] |= min_t(int, nss - 1, 2) << 3; } static void -- 2.30.2