From: Sperrbert via B4 Relay <devnull+sperrbert.proton.me@kernel.org>
To: Miri Korenblit <miriam.rachel.korenblit@intel.com>,
Johannes Berg <johannes.berg@intel.com>
Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, Sperrbert <sperrbert@proton.me>
Subject: [PATCH] wifi: iwlwifi: mvm: fix VHT NSS reporting for legacy RX API
Date: Wed, 02 Sep 2026 06:56:13 +0200 [thread overview]
Message-ID: <20260902-master-v1-1-a2cc0a65ce12@proton.me> (raw)
From: Sperrbert <sperrbert@proton.me>
Commit 774302d2d3ad ("wifi: iwlwifi: mvm: clean up duplicated defines")
replaced the explicit legacy VHT NSS decoding with
RATE_MCS_NSS_MSK, which was equivalent at the time.
Commit dabc88cb3b78 ("wifi: iwlwifi: handle v3 rates") later changed
RATE_MCS_NSS_MSK for the v3 rate format, where NSS is encoded at a
different bit position. The legacy RX path, however, still handles
VHT rate_n_flags using the v1 format.
As a result, two-stream VHT RX rates on older devices can be reported
as NSS 1. Use RATE_VHT_MCS_NSS_MSK when decoding VHT NSS in the
legacy RX path.
On an Intel Wireless-AC 7260, an unmodified kernel reports VHT NSS 1
while receiving about 460 Mbit/s. With this change the same connection
is correctly reported as VHT NSS 2, with unchanged throughput.
Fixes: dabc88cb3b78 ("wifi: iwlwifi: handle v3 rates")
Cc: stable@vger.kernel.org
Signed-off-by: Sperrbert <sperrbert@proton.me>
---
drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index ab1eb2eb0c3cd..124a5f52c53d1 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -502,7 +502,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
u8 stbc = (rate_n_flags & RATE_MCS_STBC_MSK) >>
RATE_MCS_STBC_POS;
rx_status->nss =
- FIELD_GET(RATE_MCS_NSS_MSK, rate_n_flags) + 1;
+ FIELD_GET(RATE_VHT_MCS_NSS_MSK, rate_n_flags) + 1;
rx_status->rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK;
rx_status->encoding = RX_ENC_VHT;
rx_status->enc_flags |= stbc << RX_ENC_FLAG_STBC_SHIFT;
---
base-commit: 786262be6048deab760f68c8acc2c85607165894
change-id: 20260902-master-0acd0f74df39
Best regards,
--
Sperrbert <sperrbert@proton.me>
reply other threads:[~2026-09-02 4:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260902-master-v1-1-a2cc0a65ce12@proton.me \
--to=devnull+sperrbert.proton.me@kernel.org \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
--cc=sperrbert@proton.me \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox