From nobody Mon Feb 19 08:07:59 2024 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 4TdZsW6nHRz5B2mw; Mon, 19 Feb 2024 08:07:59 +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 4TdZsW52wFz4Kht; Mon, 19 Feb 2024 08:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330079; 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=KmF2KKboWh+LOxjgovQWM3oSfqwNERvNWALltSjNzH4=; b=IoejcRClhW4OK577feWi+scR84kDL82r8XGaO52iBn2A/zwx5fSTkTxIoNWW33Zmh9LU6r RS/O92A8jyV5OkRLTnI8MT+gRmSDyQEGE4Ma94kyN0q5wXW4hlzdSAePuOxErqJbSmRwG0 XS4DBorqRweLDtRpNcJqWaYgefKHYcs+HhapViZDtiLkqQSUJcEWF1ioQR8wWvb94X5bs2 sHyq9x7bzTzraNev3/ck8WlerDYKPalaeMTg2Gw+pEQbDC0omTRymkIbok2AkqRn7rgKyl ZMv0x4iD8cYo+K/17Y98l2YjrXQEjiAONxyAbsrtheb1QnyTXw8bEiSgYTx3bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330079; 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=KmF2KKboWh+LOxjgovQWM3oSfqwNERvNWALltSjNzH4=; b=kLiUhyzJEp7gOa+2BWNu7VCARqoJY5UYhDuuXx2OiYAW5sGUlpJfnIdLMOhtzfbk5dRuDV onx3jUdnOP8Vndr1WoFdq1XJUKidpxl1nzFub62rhq9Eo/LMatYep6MQ5ZvW8TLG58AsoW NnEDml4hfq/WjEPSpytLTNTsbROFEjQr+Lzxql1oeufbxKLHoamOdtX8B+Yo43yX0hXAi0 abYAUTUAGnjdR3aEMyn74eeDa8Eo/COlAQjhi0KLsjVnY8OYwkQW9/b3upAPTm6nc7cHv4 MCkdRSz9A6D5h6uPVzMO8bGTZ5nDPrOnVNGRQD0f3uDrP0V8o+gVosYNYVCe8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708330079; a=rsa-sha256; cv=none; b=tQsyp+gY+knL2QGOg9JuLTKwq3RXtoGA7Aiv8Z1XLldDwbTMBouI6NCuKsxn0OcOUuinSc 4rbgAx3TGU/31Ix3i4hBxROaH3nY+GQY6NOaQ1ly2vEAV9GMf8vDpttOYYKcyH2YRfZ202 8R35kcXsxyXjouft7j84JOEveq7TxHC+zsjrAdvclZz+YnGDElCAesdmxcXZ3grsawXIEm FULq5/XN2OD+ExibAXqh1+i88nJXDsPWg1cK45z6KF4MplBEpHtQglUZB5A6ZQKOp7qw9H B4/6p51kswCs0gjfaS6I8o8KF6hN8y+jaNy+SNxUBiKg6cnGkkiZV+q2VPSOVA== 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 4TdZsW3t97zRW2; Mon, 19 Feb 2024 08:07:59 +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 41J87x07016291; Mon, 19 Feb 2024 08:07:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J87xD0016288; Mon, 19 Feb 2024 08:07:59 GMT (envelope-from git) Date: Mon, 19 Feb 2024 08:07:59 GMT Message-Id: <202402190807.41J87xD0016288@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: 7e5dc3c1fdc0 - stable/13 - LinuxKPI: 802.11: correct HT protection fields 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 7e5dc3c1fdc0d6bffa1dac23c5618fccf3bab15c Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7e5dc3c1fdc0d6bffa1dac23c5618fccf3bab15c commit 7e5dc3c1fdc0d6bffa1dac23c5618fccf3bab15c Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 22:35:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-19 08:02:01 +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. Fixes: 6b4cac814e32f Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43658 (cherry picked from commit 53eb2c63c9628f7f19d88d759e1932c10c9f08af) --- 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. */