Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4570171pxv; Tue, 6 Jul 2021 04:18:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWoAu3h+vy2blFEJfKkj4V5sHPEVdtQWv8Ls9yFBZ8Msof/RPRaHvzkgoSp8emxzU8V5gl X-Received: by 2002:a02:cdc9:: with SMTP id m9mr16615019jap.55.1625570329419; Tue, 06 Jul 2021 04:18:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570329; cv=none; d=google.com; s=arc-20160816; b=saUkl13jAM6tjqQmbaIBtWReKYbkR2DXqZlFoj+bOxdtXxn7oZVjM2cEm1aKRE0sqL 3t7is8oYkreIJwjw8S20Sqesh6SUgpJB0DW/+ljSj4zBXHqJE0I0K5MJIl29AUumQg3R xqfhRNBsTOdLnD/1K+SwKmBGYg59fcGYSzZDrDHAWshscm3qC1yRKenSWxDXaQdzhq83 ucWbccEg4k9/JVF4GEpjnN4WAICac9mIJqJq0NDhtS2XVBBV6PyxqKBy/GZjY++mtgk4 qT2iDNtxNvCQwaB2rcBKCMI2EX3QXMPZUKAmY7mIuZCXG6Rbv4jqIHweB3e66kLq7hQj O0TA== 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=iTMbWyt7rRjIlGVtkFwoAq3xMA0neM0hYlq/ByueN1Y=; b=LkNXwH7EQDTOGVmJ7SanK7pMsm68nXZFWGt30m5tEvQb0eAeFWmI0VNTHajUOh1WFj L8DQX+9ElO4pNd8gkfD3HI1/04IFbDbd3omQzimpCNHlQIAki/0Y8z5EBL8cP/d7pR9u 2SZPXACBuxCFjmwOEqwptusYE7VJmfLaqFP5eQKrEVkNL4/JK7PGMpOXVAC0S9PcPoqx wgCo44p1Uylc/v5GykFb7HbsIqzS8HywYmzlfezxNGk5+ax9FL3vVStuqDuSCazU8JHE Hsw3giCV8ARf4tupF735U5oE+h+G+ZFwsoM5GeknqznAxp7zQwE+NGoPVUAWTFTB1MZm WJkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LuuEtTu4; 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 u12si18872228ilm.99.2021.07.06.04.18.36; Tue, 06 Jul 2021 04:18:49 -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=LuuEtTu4; 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 S233071AbhGFLVL (ORCPT + 99 others); Tue, 6 Jul 2021 07:21:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:55702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233130AbhGFLUG (ORCPT ); Tue, 6 Jul 2021 07:20:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 254B561C8B; Tue, 6 Jul 2021 11:17:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570233; bh=SKgrW86FCTuQ2U8shcCjpqm/B2ijXEQ1rAZcVr4+KE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LuuEtTu4j6OS0eitfqCe+5BHCWJqS0HSOy97ejbjBJOiFi71vL6aJ4RnHAvMIasyK +mdA2/zqti2lvrxlJaiqm7ycJSelfBQ1v06NkNnXI65MmWuplKTEFvlFQ/B1MJHHWd y4kAJFnbfH0r5JKQ814eeSP403jklk/bqBpo4jH9JVOuyGFc23Ct8LxEl9qCeEOpVS xJ6hWERP4NCDQNPTzY4GrFHVke5ZMfgMgrzPO8wx4Rk7OPot7PmkE5Tecgs/xHo3Cm zAsPZI+lUTX3aQRAuavT6LfJX0dAmXNKW2JB8022S90R22Uv+b3XqxCAkwzgdbE/+o XKTAuHHSKb8sg== 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.13 136/189] mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode Date: Tue, 6 Jul 2021 07:13:16 -0400 Message-Id: <20210706111409.2058071-136-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: 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 822f3aa6bb8b..feb2aa57ef22 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c @@ -480,6 +480,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; @@ -493,9 +496,6 @@ mt7915_set_stream_he_txbf_caps(struct ieee80211_sta_he_cap *he_cap, c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB | IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_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