From nobody Fri Jan 16 08:49:51 2026 X-Original-To: dev-commits-src-branches@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 4dstp82h1Sz6P03V for ; Fri, 16 Jan 2026 08:49:52 +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 4dstp807q2z3Vvs for ; Fri, 16 Jan 2026 08:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768553392; 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=199b+0u9qoJc67w0hnBPdNgNnNyJEa8LUCnzx5/SRlQ=; b=PR4bS8YSFO1iD48t0iiJDoziPvYDr9USnd01GVHhIkF9K4SEdCWcmp6ntYCpT00URrKqHC 4rZWBnemezYI1O2ajPlWNdv+rJRVqqF0g+Z7FEV3A1UbY+UnFjvMj08D4nxo6wWbAkXVM8 uHBOQ+oG6mtyQpRJng2ec3RWhOP/8jA2Uv/fzW6ezHFXRUzXC/uQGMui5U8WcZZGHi0VUc OT0+fR6l/KQLTe5PZgoQrCTH0hpDRD27f/111DIOPYVoZCz35VSEkGBXTXtu4zKOg5Tle3 99n7+llpCugj2zefJT9fjtzc7us/VijKqZop6rJU4ZFRmZdcxjHBunnVzEGuZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768553392; 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=199b+0u9qoJc67w0hnBPdNgNnNyJEa8LUCnzx5/SRlQ=; b=VuEo/u1O4PLMTv/uHWhAg3gzRD4+/GVxX+voCwjpOvA8YUoN2R+1JmXrJ8EV5iGqgqpFZW qweUKTRHFq2HsvdsTeAAmylH5Brbn53uEK77JIGjy1nre52cQqwwloSRehFKTk8NUpKV3Y QefQEgS+ovxmzM3DbvObRrD4pW2weIhB4mpMUbkmpUnHRd7Z8DaWvKLelTP4RN1rq/L2Yb I+pIHjPe9WyxYAFtiChgh5oSzI2DKKByX1TpldGa8bjDSQRAkB1/PpmkZNsuhwYmt1jfNL MXT7ZN3yqVqxy8tnB7G8hTTKZdjkm9TRLst6DTWepHruiKUFi18Um3+uG1hpGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768553392; a=rsa-sha256; cv=none; b=vmvP3hqKlgC5DPWtcFUeU61M8FtFpe8TC2TTOiq+KlJXdTF/ShzjcdOeVaf3ZFLeklZz6T oYuq/wliD98Z4KBqnLuhYAfMx1pkrCiteRJB/Of6Vd/rsGaSCc1fmqktgG6l0R8GaGkFwB MvMdpvdXv2ujzgd6+gaLG+8J59Bb4JfxwRYfdoX5FyY/L8lkeGEL1XwKu6C17RFpTqgA+O eMBDomlN9qx96IwqYGHldokwEcax5nBZK23THGWBg0AGq+Vtbc7JDvKCoC+kiIvEaTjXwe GOj9UYzddg9Mh22LanSOzVSh0aN80FemfTdZALuOP7g+1KI8cwol4Ho6xFpdhg== 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 4dstp76rPdz16Yh for ; Fri, 16 Jan 2026 08:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ca49 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 08:49:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d141ee159502 - stable/15 - LinuxKPI: 802.11: fix rx_nss with VHT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: d141ee159502e620ed8be4e0670d106414d92b53 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 08:49:51 +0000 Message-Id: <6969fbaf.ca49.5a4cb639@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d141ee159502e620ed8be4e0670d106414d92b53 commit d141ee159502e620ed8be4e0670d106414d92b53 Author: Bjoern A. Zeeb AuthorDate: 2025-12-28 19:38:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 08:48:48 +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 Fixes: adb4901ac9ae (cherry picked from commit 8494be1b5af7fe4f765532f802ac0a145e061d73) --- 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));