From nobody Wed Feb 14 19:49:23 2024 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 4TZpg81w8Dz52h1Q; Wed, 14 Feb 2024 19:49:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZpg81Hghz4jdP; Wed, 14 Feb 2024 19:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707940164; 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=G5KvkbkvuLNIoZphDfVHgHHETPofsGg/plcolYsZQ38=; b=tY2uU3dD7XbsEeNen/Zz5l2jbk6aDayfs1waC6O+tytDew9ZaQniEepEsjPeYUFiw17wYI huUQrB5DUymnLLNbGFTGesK2jXooP7ClLX7HxheXYsKGVHmiaXP/WgzYY13jUjf5n5d9Fi nVbtu6Kxzkq6pPYhCeZWMRLVfqFf9kNbJQoynoLKDhGrTWCICKHXzIVO5KuklWuCexjz/Q tmARtl/s2u74jtJ2cmHD56vGQrKB2d6N10Mvr9wgjlv8rB1PJte57t5iXn2TuBYwPa93Ne A11JUEqjeu4CRb+tGR9WA+YVFaic0Yh3JCqu1XsiVs0wjvkUBvq2NRF/xGWAxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707940164; a=rsa-sha256; cv=none; b=YDO384y5OITcZZFlJFz+N3R4sJEMlDWXneg2QzXzQgHo+AMGx9tnrLUVNpYtVgurvZNI2U QlhcT9uXPV7oOjVSKsqwzN2Mxhj53CaVqU+kGnobX1L4qMcNYfcgMdmWaajKx0rNA7WArm IVpreC7VxYuIsf6KLiqjYZSv2CXQnXk3aDRZvHRnHXkIDXZa/9XntCO0EZnJUlYbMXSEOD rTtBiYL7vXVU9fLmxuI05Z4tMyYcBslIIR7L8mMfsaxeBkzcGUkk15IwwGYkIWhLJcSK6O 6OGYgvUXsgF2L+31Cr5eIbOkQAD5tFYRi9RygAyFvJJjA87Jy1njqjt4HjUquw== 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=1707940164; 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=G5KvkbkvuLNIoZphDfVHgHHETPofsGg/plcolYsZQ38=; b=tpGtq2pUZoZGX0NGCqsEUFzJrER75Q6pGps7P1N0tl/e9E45m6n6E4lqPY4dRERCDr/dIr kGDHFExE5xyhNNE32jDnPdTDPcbxqvrLo68BVRvfvZNsLTMbvgGaNcqiAYiyWhqdlo02rt xV7IKrE/A+p07WyoP+L3vLIqPhNlTaYKxMs/+cmPhpsrghrG1t/AGevwzCwVghyQjzKza9 4bsaSx7mx3AyqMe6JdPoKJPIdslRTLFez/Et+2NTyMd8/tnRyxN582Mpdm0XqsIu2vwRl8 A9/6oJnV85tebNjlpajLgSCeA9mHDUihqaOXW+DiCGCb5obqTbjKXzvpow11cg== 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 4TZpg803sBz19kG; Wed, 14 Feb 2024 19:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EJnNYZ068467; Wed, 14 Feb 2024 19:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EJnNFc068464; Wed, 14 Feb 2024 19:49:23 GMT (envelope-from git) Date: Wed, 14 Feb 2024 19:49:23 GMT Message-Id: <202402141949.41EJnNFc068464@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: 53eb2c63c962 - main - LinuxKPI: 802.11: correct HT protection fields 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 53eb2c63c9628f7f19d88d759e1932c10c9f08af Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=53eb2c63c9628f7f19d88d759e1932c10c9f08af commit 53eb2c63c9628f7f19d88d759e1932c10c9f08af Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 22:35:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-14 19:36:30 +0000 LinuxKPI: 802.11: correct HT protection fields It seems during the initial buildup of the file, the defines were either mixed or not flagged as "FIXME". Define the values through to the net80211 definitions and also annotate them by at least some standards reference. MFC after: 3 days Fixes: 6b4cac814e32f Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43658 --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 09487a318811..2000e7480ff8 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -197,11 +197,12 @@ enum ieee80211_min_mpdu_start_spacing { #define IEEE80211_PPE_THRES_RU_INDEX_BITMASK_MASK 8 /* TODO FIXME ax? */ #define IEEE80211_HE_PPE_THRES_INFO_HEADER_SIZE 16 /* TODO FIXME ax? */ -#define IEEE80211_HT_OP_MODE_PROTECTION 0x03 /* MASK */ -#define IEEE80211_HT_OP_MODE_PROTECTION_NONE 0x00 -#define IEEE80211_HT_OP_MODE_PROTECTION_20MHZ 0x01 -#define IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED 0x02 -#define IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER 0x03 +/* 802.11-2012, Table 8-130-HT Operation element fields and subfields, HT Protection */ +#define IEEE80211_HT_OP_MODE_PROTECTION IEEE80211_HTINFO_OPMODE /* Mask. */ +#define IEEE80211_HT_OP_MODE_PROTECTION_NONE IEEE80211_HTINFO_OPMODE_PURE /* No protection */ +#define IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER IEEE80211_HTINFO_OPMODE_PROTOPT /* Nonmember protection */ +#define IEEE80211_HT_OP_MODE_PROTECTION_20MHZ IEEE80211_HTINFO_OPMODE_HT20PR /* 20 MHz protection */ +#define IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED IEEE80211_HTINFO_OPMODE_MIXED /* Non-HT mixed */ /* 9.6.13.1, Table 9-342 TDLS Action field values. */