From nobody Mon Feb 24 20:27:04 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 4Z1sj44qFqz5ppys; Mon, 24 Feb 2025 20:27:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z1sj41pMvz3nw9; Mon, 24 Feb 2025 20:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428824; 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=s6ohe8mBuqmFxUxJ5dvurhD0wKG7bfYTIGBXJGbvu5M=; b=dCibmDmjVn2KNVzNC6M55PBb0GGDQnoxwSR4bpUVD84U9rMaDoD31x65l9tsGyfdCtS3jO gCvs56VIK1PabvsKmas/WTMJ2ZfhANQkqSnd6CgjoeT5JhmRP+LRhRa2Zyvrst5RFpr7TF Mv+Xu0pD7ZW6wYEkUmNG7kPfUpN+Np7Mts3ZtROUcQYnJIC4u5jqexe3OezqEv6eGndyZg yTs0SuYFxFvUkEAr6N/4uW4OtqaVsREwKIF4UIywqm2T8Zt+K78f7woZE8kFIv6cedG5PZ CfkgEp7x3EkOsX5l+u5wkQCZtnmgTxH5zt9/4A9KlDBqa6BjnXdbvGpxQAzVAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740428824; a=rsa-sha256; cv=none; b=WNTXOqKi4z0S38AOzLVE8QKMKfLhiFGLy/RybqFz8eReJP4VUOadDwfuqglZGdCuYwOba0 1vlu9UMpl8zn4JaZBEwCxuwQOIn4IqK9iEOsdIRyv/X+MrXLdUF0QISwncSYTIN+2VShUr rg1GRiuhN8cVLpfR1CtEKhVqGa6rKDGwsaZPw/XgwvTdWHTdNgRJWqcQ1XoH2sqzOe93vS gVjuPGkxlECuTBKx/j80Py+psRZPSQpgne1wdt++rEFmxarpKH8k2Wronq25KyfQMVG1Lp Ihk1X6AtBMhLIyTgo+gD/iMq+wf2BcYxKCuDzokF5j0O+2Q/coh9Wx2mxl/maQ== 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=1740428824; 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=s6ohe8mBuqmFxUxJ5dvurhD0wKG7bfYTIGBXJGbvu5M=; b=Q1qNUdtkMzL8rdnCGbiu4ioFhA/I2R1UJYPU+5S39ErJGwtbexR0JaEOrKdw1ZptPvBVXR kCGUu/53rWtnJnhFwW2oc/Yjn1FWNWSJGMhJlFTwghealeCZGRgLubhptgn03SZsGDRzat inTrJmK7iiyLJXCHQ39YOYKYogCJS3FlbjAlrYPkhK6wg2IB2Tuh/MCD79BCl+3GArOJQB PSwTMjSkqbjWgRc75OWifgdFrcRneZvKCZEkJw8vmRBuSvi7+FfvdJowdvp2h6PyHw4ba5 bU8miREkGj7YU00sqgVe1qrjDdziQlL1evip+SmOJk5tXqjHi1qzYY4UkruJyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z1sj4194szvnF; Mon, 24 Feb 2025 20:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51OKR4oj027050; Mon, 24 Feb 2025 20:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OKR4nC027047; Mon, 24 Feb 2025 20:27:04 GMT (envelope-from git) Date: Mon, 24 Feb 2025 20:27:04 GMT Message-Id: <202502242027.51OKR4nC027047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7563a2b96f56 - stable/14 - net80211/ifconfig: swap IEEE80211_FVHT_USEVHT160 and 80P80 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: 7563a2b96f567018d63744a957a33e546aa39ed1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7563a2b96f567018d63744a957a33e546aa39ed1 commit 7563a2b96f567018d63744a957a33e546aa39ed1 Author: Bjoern A. Zeeb AuthorDate: 2025-02-15 12:40:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-24 20:26:47 +0000 net80211/ifconfig: swap IEEE80211_FVHT_USEVHT160 and 80P80 ieee80211_setupcurchan() compares the flags in a greater than manner. In this case VHT160 should be > VHT80P80 as it is preferable. Swap the two flags and add a comment to note this. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48976 (cherry picked from commit 8f2e5b6ef32304ce340b91057b1eb4b191dbeac1) --- sbin/ifconfig/ifieee80211.c | 4 ++-- sys/net80211/ieee80211_var.h | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index d4dcfdf63254..9f66281931c0 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -133,8 +133,8 @@ #define IEEE80211_FVHT_VHT 0x000000001 /* CONF: VHT supported */ #define IEEE80211_FVHT_USEVHT40 0x000000002 /* CONF: Use VHT40 */ #define IEEE80211_FVHT_USEVHT80 0x000000004 /* CONF: Use VHT80 */ -#define IEEE80211_FVHT_USEVHT160 0x000000008 /* CONF: Use VHT160 */ -#define IEEE80211_FVHT_USEVHT80P80 0x000000010 /* CONF: Use VHT 80+80 */ +#define IEEE80211_FVHT_USEVHT80P80 0x000000008 /* CONF: Use VHT 80+80 */ +#define IEEE80211_FVHT_USEVHT160 0x000000010 /* CONF: Use VHT160 */ #define IEEE80211_FVHT_STBC_TX 0x00000020 /* CONF: STBC tx enabled */ #define IEEE80211_FVHT_STBC_RX 0x00000040 /* CONF: STBC rx enabled */ #endif diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 4c5dbcb7cfc0..afd3beeb5d73 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -728,11 +728,15 @@ MALLOC_DECLARE(M_80211_VAP); #define IEEE80211_FVEN_BITS "\20" +/* + * These flags are compared in ieee80211_setupcurchan(). + * Thus 160 should be > 80P80. + */ #define IEEE80211_FVHT_VHT 0x000000001 /* CONF: VHT supported */ #define IEEE80211_FVHT_USEVHT40 0x000000002 /* CONF: Use VHT40 */ #define IEEE80211_FVHT_USEVHT80 0x000000004 /* CONF: Use VHT80 */ -#define IEEE80211_FVHT_USEVHT160 0x000000008 /* CONF: Use VHT160 */ -#define IEEE80211_FVHT_USEVHT80P80 0x000000010 /* CONF: Use VHT 80+80 */ +#define IEEE80211_FVHT_USEVHT80P80 0x000000008 /* CONF: Use VHT 80+80 */ +#define IEEE80211_FVHT_USEVHT160 0x000000010 /* CONF: Use VHT160 */ #define IEEE80211_FVHT_STBC_TX 0x00000020 /* CONF: STBC tx enabled */ #define IEEE80211_FVHT_STBC_RX 0x00000040 /* CONF: STBC rx enabled */