From nobody Sat Feb 15 15:51:16 2025 X-Original-To: dev-commits-src-main@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 4YwD113Pdcz5njhL; Sat, 15 Feb 2025 15:51:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwD11100Mz3Gsx; Sat, 15 Feb 2025 15:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739634677; 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=GDThDCaSgjWONlRcqyHDlirG1yGjk6GF9zBUbFfzQgI=; b=S8TGk98rh5s5c+neF0/+M8qVFt/m0Ve+eKgGbBo72BXWzCikSq07OK+Kd+e/Jz3w6NYxCd JcnaBnhw8ahG7eRQiJwcBzHYCPDawK2Mt7UjtwvEZMh/v6sPLyWZckFdVo++HO072n0RB3 scGF6SPuBE8lak8YXUEN/MUdSHF8XmfZ7/7qji9OTE5ydQS0MF+1LF3mTRIRsAOyAjVISs NSXX2RwC5wvLBJs6sNQRO6BEudVCh4Yuetx+/+lKDqOj6YNLN2pAtCYt4KREoVT41FyRnZ bb+IDaHNpxIqMt8E8hBCtnJpFxPhIJ76in68eWLQQMPlAsNsbHR8cNLzdiwH7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739634677; a=rsa-sha256; cv=none; b=oTRLztqB+x2plpAinb2npVWKTDeS2ZqS+g6okoQ/3ajBGfZbJb1VkNeyN9G63fGTu9vKWo 8p66e24ZZtmyYqYb/DjYN8Sm8p9Jc+0aIA0x7XnuUA7A9/PV330ibbdZy+RgvQrLDeK6RG Y6KA62kyVaFdiB+lmjNFW4wcT8cqMZVuKkrEHJJer2yPieSYFFhOELIyYKmQstfIX8X/Gh 9ilwdJlLICXRnmU0Nw55iGak4maEQBSvG7lJ81/rbeMKOF8BpPPMjliT1+DJ0Jxo4y12Lg rQiAwbUiVLbMqGg2I30oSjfoAW63wwDi03vuhC3lMBX5yq1dCBXCqU2kURg2+A== 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=1739634677; 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=GDThDCaSgjWONlRcqyHDlirG1yGjk6GF9zBUbFfzQgI=; b=uYxw60bO6RJ2nEu+tNpJgE+xaIeTWnt5BaiENPTs0tC0kQeq9Dzwd9EI3R2HxgU8ZfdbEp bYpu+jKZZQ3nhsXRfFU0e4Dab8XrwZh/x4EdkrR9vDJ/Ee+Ymj3FiGyDxcmeZ0AfzvOFJm zHsOQo3G/R3Ml87uMQBrMiFkgQHf0CJa9f52w3nkO0h7y3wFMHbvabCqzGhie5yMqRkhQf kAeontF745+AZZjL/YvEIZ2Qqb8p84KUAHyjWJ9DQRMqdSAuK3WSkcWZpC8I5K5uyqlwMI CsFnmCuw7POfzGuAi0bwVnJrsAdh1OUwtxWuDvZciJdotmMcq2UaZGBzf1sT1w== 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 4YwD1073P4z1MDp; Sat, 15 Feb 2025 15:51:16 +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 51FFpGf1050316; Sat, 15 Feb 2025 15:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51FFpGGI050313; Sat, 15 Feb 2025 15:51:16 GMT (envelope-from git) Date: Sat, 15 Feb 2025 15:51:16 GMT Message-Id: <202502151551.51FFpGGI050313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8f2e5b6ef323 - main - net80211/ifconfig: swap IEEE80211_FVHT_USEVHT160 and 80P80 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 8f2e5b6ef32304ce340b91057b1eb4b191dbeac1 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8f2e5b6ef32304ce340b91057b1eb4b191dbeac1 commit 8f2e5b6ef32304ce340b91057b1eb4b191dbeac1 Author: Bjoern A. Zeeb AuthorDate: 2025-02-15 12:40:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-15 15:49:02 +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 MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48976 --- 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 94e8a05846e7..5a0d017bd590 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -732,11 +732,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 */