From nobody Sun Mar 8 17:07:34 2026 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 4fTRQt4XSpz6TSms for ; Sun, 08 Mar 2026 17:07:34 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTRQt3vsbz3vd6 for ; Sun, 08 Mar 2026 17:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772989654; 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=88ZgkqfowQEiomeAjAM9ouopph+AWkV982BNwFgVF2g=; b=WMeYktly8NbHP9bW4dpRP8UL4PEtzURBbM5io2Pb711mhCj3xj6caMOdfe1WofbJq3Xb5J wBhdpoXd1zd8fLaZrQBFkeO58M8/RVVon9h46xiGvKREEh/QI7/Q2Yp94Rvlqh9+RWv5g2 xW64DHsFOUZyEGkDTDrnPfqdadNicLvm1Ve7ug1nVzFlgHeQZ/zLhXwjCBxZSa+B75IHDo VflBfH1KkmjORM28r1K3PhssxGooAEJah909Oty/ptslKq6QtPAljc2cfbuIKKo0G7lwKC GJ/9tlZ4vgzP31Op5LZB6TG73XhLkyDMMvqGePy/PJxxHXJtIsdK0wc5C0wOiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772989654; a=rsa-sha256; cv=none; b=O83Y0f5Zs3izj+ZvDZq/ublECUSwUsAp92AqxY8Db++UiKX2ims40DmrTm7tiduh9mQNDJ yvLX8fKKoyLsDgrtV36M+Q8/uCcbgkJXe/j1MWo/M5Oi3iuRn3xgTvTMIjn6u1vjqdqLck j88LPYOBV3aGasLkDiigyEVmmUIpq1uwBTLXB8Ed1EukYvmsGtENv5v2pybrf/8VGMu8mM fE9gXFxlMDDXHVN/QMNG0sJpNUgow6nmpnj8r4tb9JF19NQ5Ce8x25gTNyuhV5QHpa3cW7 wULHt9cDenAKl++SKdEKlN+M4wVCGBBLOvVc8JSZdnKEVlJ5Gn1FmBS5My7R1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772989654; 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=88ZgkqfowQEiomeAjAM9ouopph+AWkV982BNwFgVF2g=; b=DRRC7B1dw4P51LhQNDgauBI1jOlrEjtGGTctB2qGKkVlkijcMC+84AtXQGlLP8U0CQYKRc gcUcVQyAtJMO2VlwsvpvbFh0lRxwxHXpRBXz5mS8wKoGPFYKVgf+nXtte2Lt/K/efkTYCd fWZ95J1jpiQYeIMXqoyUsC9IYczPCzz1F8SmTs2xcAFwr8Abq3XaJkXdfUcE7svEUZ3eew 5UJE9ib20trWG7Dcha21142WD2kKYWYYju3K8RVufRGOTwZG1ji9cq8P7GJL1amDq/0EAT ZIk/anBfZ8NnBEm+NPXB3nmrvweLbTPwBX5RRDGjfQdEvC/Ly+vzT76RdFv8tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTRQt33cyz13b4 for ; Sun, 08 Mar 2026 17:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45bf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 08 Mar 2026 17:07:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 6cfd2b93e680 - main - net80211: fix VHT160/80P80/80 chanwidth selection in the "40-" case 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: 6cfd2b93e68061c7831016b91c2e308d01658764 Auto-Submitted: auto-generated Date: Sun, 08 Mar 2026 17:07:34 +0000 Message-Id: <69adacd6.45bf4.3cc0e7a1@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6cfd2b93e68061c7831016b91c2e308d01658764 commit 6cfd2b93e68061c7831016b91c2e308d01658764 Author: Bjoern A. Zeeb AuthorDate: 2026-03-08 00:57:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-08 13:50:02 +0000 net80211: fix VHT160/80P80/80 chanwidth selection in the "40-" case Depending on the base channel ni_vht_chan2 - ni_vht_chan1 can be negative. Apply abs() as indicated in the comments right above | CCFS1 - CCFS0 | = 8 or > 16 in order to fix the channel width selection. Sponsored by: The FreeBSD Foundation PR: 293645 Fixes: 4bf049bfeefd9 MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55717 --- sys/net80211/ieee80211_ht.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 38568674a792..9b2b0df33785 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -2038,11 +2039,11 @@ do { \ } /* CCFS1 > 0 and | CCFS1 - CCFS0 | = 8 */ - if (ni->ni_vht_chan2 > 0 && (ni->ni_vht_chan2 - ni->ni_vht_chan1) == 8) + if (ni->ni_vht_chan2 > 0 && abs(ni->ni_vht_chan2 - ni->ni_vht_chan1) == 8) can_vht160 = can_vht80 = true; /* CCFS1 > 0 and | CCFS1 - CCFS0 | > 16 */ - if (ni->ni_vht_chan2 > 0 && (ni->ni_vht_chan2 - ni->ni_vht_chan1) > 16) + if (ni->ni_vht_chan2 > 0 && abs(ni->ni_vht_chan2 - ni->ni_vht_chan1) > 16) can_vht80p80 = can_vht80 = true; /* CFFS1 == 0 */