Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4580948pxv; Tue, 6 Jul 2021 04:34:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjogoykU7chxDwOZJd4ktkrBOTbkm+0HNAJ97zEBSgMgDF8BQ04bq1ffJ0luYJv+syvMkI X-Received: by 2002:a17:906:7304:: with SMTP id di4mr17854467ejc.531.1625571256373; Tue, 06 Jul 2021 04:34:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625571256; cv=none; d=google.com; s=arc-20160816; b=LkXwAzWAE7DvGtn5Q0qssnWOUG5oAJQiiz78Xt+9ugOjrOaNb+p5f3LlSejq0TxbBG DfSLHnLgGjqkgGteH7DgeTRfyRrohzwM3dgTNNJI0nxeFInLTaKvUDBL9tjCnSMq3dJT mbPsBmu1zMHFdvN7tgrWBOcfpuhMIjkrHvppfAUuw6HcktgFBQadaxagTnKMH5z9zC+e K3Mi7h3yNH4llBWyu/PXH4v2N/AmWW/03PZ5V1aSTfuPcejnxqxWVOZI1rc3H1Kc3hL1 +siFVEJiDkTkdbwm1Hzc2Qnp2X78JHuFmVm12qav3CtV5qy3Jo0Nae7Ixf8XXYwggx06 nPnA== 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=dGDxnfhGwuWLteWLMqaEmBtZMwOS3Pybvv8EAkD5fzA=; b=FYZOUebBGflgBOcmrkaCsd1jQGpnR3Q/Mj+bQc34bD45vR61cqFcCJHy8OzauI8bWi mXudmK26AlTipBzcH1bTzuyIAshBQrdbJ/HA/IzV32zgCG0yTOGy5h/Og+rjz78jgwdF M3VcZpw32gRgNwTUl7jGoR2APp6QmDbk1j6PskPI0iQ+0uhFqKJopRSyDtDbTIzgg0aY FeGYh1aGq8bTP6DhrGvCBmjJkaQJ7teg3vpVZISVf7WpktfXr5H3twqdxCkcqSnOXO78 x49A4vC1dkATtiqCs2V7atrwWFz9yKF+t2pwow3NVuY04lYbCJiHSo53EQMFG1O2mFer EfXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=C9iX0r27; 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 g8si11902440eds.273.2021.07.06.04.33.53; Tue, 06 Jul 2021 04:34:16 -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=C9iX0r27; 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 S234926AbhGFLds (ORCPT + 99 others); Tue, 6 Jul 2021 07:33:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:42590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235286AbhGFL3w (ORCPT ); Tue, 6 Jul 2021 07:29:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BBAA461D94; Tue, 6 Jul 2021 11:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570453; bh=PYndkoxT8VJSQCBBjAEcCYBPObdOP0m3A43bg4uEqJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C9iX0r272KaqvZ7n7SGNw3Qejkk3pdMVIOimBMuYCIg4KqkVMhAfEFzGxur7YViaI /wC08r0uE+AinizUVMLxMgGwbcIEum8sEdukNrt2sWyRMBh3wG+k+9UtFUd6ntMGRL z8xsLD/IRa+Eq32QFZZSQvGloLoLCbaS9OMAI2G8Eb1xT3wu+aFMFbKv/xCKZUIufq 14EHWLotIMkPXHZsRSstfwGFx58MQO4t9QNsKi51cY3yYVWgSLI2myXKneLAoPgcay 8tkgliSAkSKt3RLASNN2ZeDtrzXheRCsF1OrwdFnN8E3uWqaiHW5QsSxqhy+IVrOIE 0FWwn0YkqR+HA== 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.12 110/160] mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode Date: Tue, 6 Jul 2021 07:17:36 -0400 Message-Id: <20210706111827.2060499-110-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: 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 c7d4268d860a..5ab34606c021 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c @@ -452,6 +452,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; @@ -465,9 +468,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