From nobody Wed Apr 1 04:34:08 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 4flsZZ2vDxz6Rbhs for ; Wed, 01 Apr 2026 04:34:14 +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 4flsZZ1Y7vz3MBT for ; Wed, 01 Apr 2026 04:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775018054; 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=a8L8MRIlDP3NVhRR+o1GMmtsZg/RaWzH8BPOIbALV88=; b=tJ3SbbnDdivGBSm3wEHUo/ImZky0jAbx706tjUDpVr+BbdCYi7QWEb+OZhPa4BLlxSUmGN 03bJ7cFbqHKbGcdqP8skegTrQhpKl3lRrpztO6q9ZVOqcDCdmJCNGU8m9YxRafLVKN41by i3evxmnh0yAdHFcm3tqtyGQHTjyckePSCOSI9Uo/AX37QZrh/NTohTcZSaZZXsRSLysvIg M8Jm/Z2WwNoKFlHqfiabLJ7rn8c/H2DezrupUQIBrNihN/N3PE53YrzApzfdWWDOh1qsVI x9u1rkDUj+HDdx0dAfA/rnoxOu6gKHVrVTozp6sb1XjUB57gRnBZfJSi7R/jug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775018054; a=rsa-sha256; cv=none; b=xafCE84H8dzcD6icP7caygcVgFSjwGoJ//lV5viaJH01pJuaZXC8rYw+1mFjndI/vUSVzY LxMIbdcMoc9Ah6votP6/uIoqiNoD9+HIc9JOamyjV5HQ9wwPDtm5IHoV8+McbT5PBIkB8a nWvsA5nWch/nhgZCe4xsnT0ITGZ53ThgGFojo4+sPka9uCMEL9tCAstPv0BSGXGhoAb0p6 PelMeqwv51znq3J3rmfuYU88mJ3EUHRk8GCQ5u4BICfLSA0Y0z2hdtTuTWnGJ92/xw28Ot VtmQjRxliI+3B/6RqXSSwApkIt1aH38m7w+a+IUIPi1+IJAo6XR/8IvFguMmdQ== 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=1775018054; 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=a8L8MRIlDP3NVhRR+o1GMmtsZg/RaWzH8BPOIbALV88=; b=O8sKVMHxOQEcuZjZDj1xynw9/8zRrNVqBjFraFwPFhRAJFjrnbPDVOvhEYM8du52hXUIjo C9mJkiYjgMSccoG+ONHfCmyBdEQXecjSpicZeRSa9zr8zYesxdV4W5VjM4q76MaaCYBLD2 bkJIA9bybWcPqRyGIzoP0383T+UhpUVSIeNp5YyTyq8CR0pq0vwFnvFvFMqJrIIAVCLFAw 1++BE+xVyxW3s9bKS7rA4nGl2rJfXsuDlvh9mPyKbAsAgKKaCjH5cgxQlMxhJA4qHs6qjc G/FB+Xfp7b0vEfRgJ5FUHVl1J6aqsxw0z0VnNlDmZjhrNwl9wFrJIhhr0aQgCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flsZZ15CXz10l2 for ; Wed, 01 Apr 2026 04:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42713 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 04:34:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f4e018e9a49b - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: f4e018e9a49b7bf4ddced51ad1ffc4415182cb45 Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 04:34:08 +0000 Message-Id: <69cca040.42713.ac63325@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f4e018e9a49b7bf4ddced51ad1ffc4415182cb45 commit f4e018e9a49b7bf4ddced51ad1ffc4415182cb45 Author: Bjoern A. Zeeb AuthorDate: 2026-03-08 00:57:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-01 04:33:47 +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) (cherry picked from commit 68fcf0b94c5167f89481052f358064c9b6732553) --- 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 db5d7a90918c..697841a0ce86 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -2028,11 +2029,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 */