d3yvpJTc4WIrL4/GeQPZHo5q4g0KgZFmDvBMM6DUfRiwazeV83JRC7oeYtSGk6KKKfk6 5bUc3vNRP+iZrCrok/AlUCTxBjpp0NKSUck84SWkpMfSK5Kl4ku8mWSmk/gn6g7Kahy9Kp QAA2oh7xRoUO2/fbywXKOT6o8waytiC/SErgdY//4bg+0BXTlF9KcdGtPyL5fA== 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=1773248022; 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=xo1f2ReEP7u6eUDgfcINmyT3lnYnFW4dme6XJu0huvo=; b=bIO8q7a9Cm6coPiBxERG31ed43/WFl3xd7ETG4Gnju1ZXUobCaAhEDMg+QFr3j85WoOGwM xUzVfnH269CDqSsqrhpVLApOap/3sQMOdpDuT95TqISRlBcz4Q99wgnf8Bxx5tpRRh4po4 4o5aOrJvia2E1981p/QGMV35xaeDkZ2mKuwULj5+G+BfUaKRZNC8kE+oFHduTrnyMCxCZx rv/J81VXgc5Bqzs5MDJM1mCNEBwHc9cSoyKGR81/Mat6KMJiBkRYQVNbtrfT/JIUtfw3R2 ig3m5nxmbmug5ZNMAwUnajEoEmQ0k72kYyMiPL66XkVHmWPwqOEQ8yDLKwgpNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzV3qfxz16NW for ; Wed, 11 Mar 2026 16:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44acb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:53:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 68fcf0b94c51 - stable/15 - net80211: fix VHT160/80P80/80 chanwidth selection in the "40-" case 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: 68fcf0b94c5167f89481052f358064c9b6732553 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:53:42 +0000 Message-Id: <69b19e16.44acb.13ff800e@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=68fcf0b94c5167f89481052f358064c9b6732553 commit 68fcf0b94c5167f89481052f358064c9b6732553 Author: Bjoern A. Zeeb AuthorDate: 2026-03-08 00:57:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-11 16:53:24 +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 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55717 (cherry picked from commit 6cfd2b93e68061c7831016b91c2e308d01658764) --- 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 b3c9532764d9..508ddc7de920 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -2036,11 +2037,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 */