From nobody Sun Feb 18 21:11:30 2024 X-Original-To: dev-commits-src-branches@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 4TdJJ31VfMz5Bm3p; Sun, 18 Feb 2024 21:11:31 +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 4TdJJ30CP4z42fm; Sun, 18 Feb 2024 21:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290691; 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=Picd6LbrTS1FFPnuZ6m1HXw5cyhFxOg/gPpu/u0dZMc=; b=VZI9DcgsujnqbaGEisP8pZvYqu0HZRxk5KTI8UhW76eF17E+Or0ZTE35BmuZxK3F4odPts ChOx4U3Tpub5I30wPS89WiFCPdt7pRQZalRBgIZ0N2lqMxoAlMWtSoJB8w8HqPuXX+5d6M beQVannymbdqWYdgs/pRhvszPLx/ziVvvmvY6p1zqZthJiGHZVBucsJxJhR3BVT+Ei5XFl cPkY1cAYL9M7VoUxjD92xGv9m05THiaMaGtJAyjSUPDsusJnq/seByIl52pmNm9K1jzwaO IcLZhyQnfWIEu/S0LvQ/XnwicabqlBKZjbKjKYk7EXXBeajHqEDcMktKzDfH1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290691; 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=Picd6LbrTS1FFPnuZ6m1HXw5cyhFxOg/gPpu/u0dZMc=; b=Jd8fo9Bb+39/VOX0SuapWAr7dbDw+kmhvPG6Ch9uh4uLsK9eztU9q8Z9OYUhP9qt4fV4jN wF13bEqCTHmSAMBBdJq1ymFB2cRQiSqr7OE0w8vWWWJSGhJdadn8xQcoCIWsY4L2vtV9tR FIeEB/EThu9Q3EE1KzinPnSTBPra9yFa+O1SRQG3lX7OrPKXGnLgf/yy2RV6wdyRPFvDYm B5TpwnAF0ujvEJhipQ4jpZRFrOJ+aLTyOlAiJCPtquQnDeeHhgv0855tekO0qaEr3Z8KrS SzPlUXsUOgX9c1a2WXOJw4PXPyOtNzMf02apG1IqoybpSGuT52SqtSeRS7uHEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290691; a=rsa-sha256; cv=none; b=tpYkfT7AzvcBPV3S1yyVmzj5JWKbBrFu/PO6i8oK+5wZ3pgzvebitAZmBfjXuPVnW7gr0+ M51nzDqMXyNTPUvxt6OKrUiqBWzZFgqxaLXa/W4QZ+Wb9zqEMEKGXE5yfyJJ9SOxhb31lj SLR/U7jXINr/b6senuL23HZxtmg0f95vzoUnDJG1bgjcphXI4DwOyIIsE/94hSK+v5T8ZP 8mIVNO6mB+GWPfMfxNakk5ooO7JABcyOKr3VGj5WxrxqaORGNP4d4GoUKqkkQ6a9MQl+XT Y7kcHxvlKMi2TLFcvu+BWJCtJnvG0P5lcOzNB8uRBi/QYXDy+kCOnQC1i/TxTg== 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 4TdJJ267plz15xx; Sun, 18 Feb 2024 21:11:30 +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 41ILBUaY016063; Sun, 18 Feb 2024 21:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILBUSE016060; Sun, 18 Feb 2024 21:11:30 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:30 GMT Message-Id: <202402182111.41ILBUSE016060@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: b70179a93208 - stable/14 - LinuxKPI: 802.11: correct HT protection fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: b70179a93208653f1228d34dc65942f187f8d9df Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b70179a93208653f1228d34dc65942f187f8d9df commit b70179a93208653f1228d34dc65942f187f8d9df Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 22:35:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 18:31:16 +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. */