From nobody Mon Dec 29 02:55:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnL4vw6z6LYm8 for ; Mon, 29 Dec 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfgnL2jDqz3qR5 for ; Mon, 29 Dec 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9C8JIzCXAVnOxx2lnsbcvIMgJknnj+ZkuE3MEKM2vTc=; b=OmykITYqnka4DmpyLaptys8gJjKtWrQH2uJJrVWoI0D3B+Sma144KM8ClOtvK8id/ziYzE c2rtHdDlP/tsj5PXmXYhLv8FlgQDmz9TfPw4iqUrQc+5OMnOhM5c9G2hol1ydv668bzIaW 67b7Gssh6BafAiYKQgefOaGzod/3W2Snml1p9jcIY5BPNuwWNEgASQRdo7PlUTD84y4id9 DPn2rnjruFyLkx6Gs9XmBjddS3uyOiDrtorJLpaBcba80MlG2RXlHqEt1nNuaYrgeg4EEh x7kn6C/HvSJOXOL2s6LPQgVSMfu326MWO+ToPoTvlqQ/HTEw4lgZkihEZQfEsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766976918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9C8JIzCXAVnOxx2lnsbcvIMgJknnj+ZkuE3MEKM2vTc=; b=mZmfFY1WwhS6WLnUCnkUG2wCJLY+DrIyPwRlfn8KRrOq+DAKDM8rWEiHJyaKrZ/T0i0bxW AYVALjzP+OJwIOSGPyGeUHUMDr+ijDcZ1hB3iBCo3VaA2cfOZ7bJ15+ywlW82RJOL9HOWW I6T7mJCAqE4yFN9aQVMa7930iIamNnyOJOy0/w42BWi8v3L9BAvNvKdzbcWepUcAo7uL5a QvgJ4/VqzGeb6lhmri+5Q9vFhn2JJkwn/NyerzmEbBcBL0KfKc56fvaRnaq8ngUz/aFRPp QQaxfEwUvDZKcbRTObhgRyIptYQvNEVircA4dX7rToOWtkO8SiWo4QT5G1hAAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766976918; a=rsa-sha256; cv=none; b=fNtcKLI8bO5bWLr1lO1a6DyhGftwxHX5FtjaFK4NRaXtDWiA8ZSSdu89en5VRmXWIdsbOo MjvtpxIyFOJm5IsX50ZHFtWeAvZ/qNQLoRFCcUPfshj+3eN00sB0I5fZ6SuTxv8hkCM88o CZQJZnIVKDPGtFI8vtnhJlW1sYk+2EDukbbePAaQMePn6F72LDYu1mKVn+CvhEJMqUZg3x 2ESfdVbnUt8IQJttOtJLh7iMRKqbtREl7C1oTBYXIcOOkg1L2hoDS26aggr5EEwrqs31hn Oq3qOZEFXFfiSBSCM4N2tSkQn+Grp2H9EN+6EvPSRUVhzNH3H4TFTmWAhEj1QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfgnL1k2tz1BjM for ; Mon, 29 Dec 2025 02:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 84f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 02:55:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8494be1b5af7 - main - LinuxKPI: 802.11: fix rx_nss with VHT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8494be1b5af7fe4f765532f802ac0a145e061d73 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 02:55:18 +0000 Message-Id: <6951ed96.84f1.680464e7@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8494be1b5af7fe4f765532f802ac0a145e061d73 commit 8494be1b5af7fe4f765532f802ac0a145e061d73 Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 19:38:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-29 02:54:03 +0000 LinuxKPI: 802.11: fix rx_nss with VHT When fixing single-stream chipsets, like iwlwifi(4) AX101, we started masking the announced with the hardware supported values. This would probably limit, e.g., rx_nss. During these works we fixed a loop checking from the highest nss=7 to lowest nss=0 (8..1) and would set rx_nss if the stream was supported. This left us with always setting rx_nss on nss=0 to nss + 1 = 1. Instead only update once when we hit the first supported MCS value (highest number of supported streams). Looking at the diff of the mentioned commit hash which gets fixed it looks like even the old code was not correct either. This only fixes the logic to calculate rx_nss. This does not yet help with modern drivers to actually update the value. Code for this will come in a later commit. Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: adb4901ac9ae --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index f4b534122b87..1ac28dfef448 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -693,7 +693,8 @@ skip_bw: sta = IEEE80211_VHT_MCS_NOT_SUPPORTED; else { sta = MIN(sta, card); - rx_nss = i + 1; + if (rx_nss == 0) + rx_nss = i + 1; } } rx_map |= (sta << (2 * i));