From nobody Wed Sep 21 14:01:40 2022 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 4MXg7m67MBz4cYM3; Wed, 21 Sep 2022 14:01:40 +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 4MXg7m3BSgz4Cqg; Wed, 21 Sep 2022 14:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768900; 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=mVT7sKvYBuQjJj7x2maS8DWalDGlTJ2ypiI63NgReoE=; b=BCFRTZB2SR1LBIodlSN1U5GWMxFcQY5/dG3MERodwqaA6qWt7tgx1ySFY1TH/Jq9rs2CBl 8OIXmkLJ1e+GeQnwD1l1QbiA8g6wicw2k/pVpvIuXDOCCx6YQagej3FzRD/N4i41HJb+Jq 6pH7wMSOi0T2UymixkW8GYh3cPeQdS6qQq+fTru5EUWahd+yZv5qcM53XaCjBqDAm5ZRFn xAp6+/aVHOf8HdgXk5TNkvpXVDFgE0lBVYLqkk66rSnUgMZ4C9Z0YN1oRoB6Zb7/1HrFmp kkTO8yo1mQEMq2gvpgRRYDjnRvHpe1LDHL28vbdficv/GxhhQQp3mqpJtIcCIQ== 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 4MXg7m2JFFz14y1; Wed, 21 Sep 2022 14:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28LE1e9e000479; Wed, 21 Sep 2022 14:01:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LE1eMN000478; Wed, 21 Sep 2022 14:01:40 GMT (envelope-from git) Date: Wed, 21 Sep 2022 14:01:40 GMT Message-Id: <202209211401.28LE1eMN000478@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: 4e1b6aeee02f - stable/13 - net80211: update (parts of) Action field categories 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/13 X-Git-Reftype: branch X-Git-Commit: 4e1b6aeee02ff5ca9e2097fdec36d17119aecfb5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768900; 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=mVT7sKvYBuQjJj7x2maS8DWalDGlTJ2ypiI63NgReoE=; b=ygSo8BiFJuMeNT1AVV+Udmifj5XS0imTTkWlmz8NIItHqrvpAEpIHullE3S2z2ZIwDEqFk SOEqLNeD1CbNTaDywgKA7lfarhHxWf5M5bcvoVtIodS+4Yg38d+1LOovdrWRnKxKQAifiZ NBBbGDhsaZOx1Q+zMOl4yma1Qv2KABBCd5U4kgQEN8YicOXbi7bXj8esmRP7EtICjG8wuQ AFZtVuT98AcAf65dSZxw4xoAxgVtePFKHXQBOHy8RRxPqtI1M5tchTjZ7y2ninlImGWpSF BV8viUe45Y0GIburGM84XyyYLkJX8yRxoX0pkPyl3QHGkWTUUVMwjl4J21fwWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663768900; a=rsa-sha256; cv=none; b=uyLGGzqlcfV3CWtxOuscyNzRP0DyoyO7PLKgXCfl3pXwHjNSKoH8pfbDpgTov9lp/vfBzC n7/KlQIrihg2o8E2YW0P6wEDf8ggc/LWpvhF6QWECUgY3XXUrjv48K6DberoHBmfdR3/uz rblB1rEMVSdEz4KKQfkQfp1v7S7xrcngNNNhCKoQzvSoE+8VevPG9pCY6N0qV7DVsvmkB1 fvkYB0CRWjYvMRHqDeNTCck98xbU/gV11UBbyNO9LKgZLbOCHbPg++p/YU0Yd7mFpCkr+3 tAzWL45gSN20tKmE84o5ffeUlBzJm7+Cp56RdxKxoYX0fA8MfegQoWfp+F2J3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4e1b6aeee02ff5ca9e2097fdec36d17119aecfb5 commit 4e1b6aeee02ff5ca9e2097fdec36d17119aecfb5 Author: Bjoern A. Zeeb AuthorDate: 2022-09-07 23:28:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-21 11:46:47 +0000 net80211: update (parts of) Action field categories Update to the full list of action field category values based on 802.11-2020 with 11ax extensions and remove one value Reserved nowadays. While here annotate them with descriptions. Also add Spectrum Management and Radio Measurement action field values needed in LinuxKPI. No functional changes. Sponsored by: The FreeBSD Foundation (cherry picked from commit c994352a8841eb4533c587bc524f2d1de659a20a) --- sys/net80211/ieee80211.h | 69 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 59 insertions(+), 10 deletions(-) diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 84a147ccdde3..95889c266e09 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -413,16 +413,65 @@ struct ieee80211_action { uint8_t ia_action; } __packed; -#define IEEE80211_ACTION_CAT_SM 0 /* Spectrum Management */ -#define IEEE80211_ACTION_CAT_QOS 1 /* QoS */ -#define IEEE80211_ACTION_CAT_DLS 2 /* DLS */ -#define IEEE80211_ACTION_CAT_BA 3 /* BA */ -#define IEEE80211_ACTION_CAT_HT 7 /* HT */ -#define IEEE80211_ACTION_CAT_MESH 13 /* Mesh */ -#define IEEE80211_ACTION_CAT_SELF_PROT 15 /* Self-protected */ -/* 16 - 125 reserved */ -#define IEEE80211_ACTION_CAT_VHT 21 -#define IEEE80211_ACTION_CAT_VENDOR 127 /* Vendor Specific */ +/* 80211-2020 Table 9-51-Category values */ +#define IEEE80211_ACTION_CAT_SM 0 /* 9.6.2 Spectrum Management */ +#define IEEE80211_ACTION_CAT_QOS 1 /* 9.6.3 QoS */ +/* Reserved 2 was IEEE80211_ACTION_CAT_DLS */ +#define IEEE80211_ACTION_CAT_BA 3 /* 9.6.4 Block Ack */ +#define IEEE80211_ACTION_CAT_PUBLIC 4 /* 9.6.7 Public */ +#define IEEE80211_ACTION_CAT_RADIO_MEASUREMENT 5 /* 9.6.6 Radio Measurement */ +#define IEEE80211_ACTION_CAT_FAST_BBS_TRANSITION 6 /* 9.6.8 Fast BSS Transition */ +#define IEEE80211_ACTION_CAT_HT 7 /* 9.6.11 HT */ +#define IEEE80211_ACTION_CAT_SA_QUERY 8 /* 9.6.9 SA Query */ +#define IEEE80211_ACTION_CAT_PROTECTED_DUAL_OF_PUBLIC_ACTION 9 /* 9.6.10 Protected Dual of Public Action */ +#define IEEE80211_ACTION_CAT_WNM 10 /* 9.6.13 WNM */ +#define IEEE80211_ACTION_CAT_UNPROTECTED_WNM 11 /* 9.6.14 Unprotected WNM */ +#define IEEE80211_ACTION_CAT_TDLS 12 /* 9.6.12 TDLS */ +#define IEEE80211_ACTION_CAT_MESH 13 /* 9.6.16 Mesh */ +#define IEEE80211_ACTION_CAT_MULTIHOP 14 /* 9.6.17 Multihop */ +#define IEEE80211_ACTION_CAT_SELF_PROT 15 /* 9.6.15 Self-protected */ +#define IEEE80211_ACTION_CAT_DMG 16 /* 9.6.19 DMG */ +/* Reserved 17 (R)Wi-Fi Alliance */ +#define IEEE80211_ACTION_CAT_FAST_SESSION_TRANSFER 18 /* 9.6.20 Fast Session Transfer */ +#define IEEE80211_ACTION_CAT_ROBUST_AV_STREAMING 19 /* 9.6.18 Robust AV Streaming */ +#define IEEE80211_ACTION_CAT_UNPROTECTED_DMG 20 /* 9.6.21 Unprotected DMG */ +#define IEEE80211_ACTION_CAT_VHT 21 /* 9.6.22 VHT */ +#define IEEE80211_ACTION_CAT_UNPROTECTED_S1G 22 /* 9.6.24 Unprotected S1G */ +#define IEEE80211_ACTION_CAT_S1G 23 /* 9.6.25 S1G */ +#define IEEE80211_ACTION_CAT_FLOW_CONTROL 24 /* 9.6.26 Flow Control */ +#define IEEE80211_ACTION_CAT_CTL_RESP_MCS_NEG 25 /* 9.6.27 Control Response MCS Negotiation */ +#define IEEE80211_ACTION_CAT_FILS 26 /* 9.6.23 FILS */ +#define IEEE80211_ACTION_CAT_CDMG 27 /* 9.6.28 CDMG */ +#define IEEE80211_ACTION_CAT_CMMG 28 /* 9.6.29 CMMG */ +#define IEEE80211_ACTION_CAT_GLK 29 /* 9.6.30 GLK */ +#define IEEE80211_ACTION_CAT_HE 30 /* 9.6.31 HE, 80211ax-2021 */ +#define IEEE80211_ACTION_CAT_PROTECTED_HE 31 /* 9.6.32 Protected HE, 80211ax-2021 */ +/* Reserved 32-125 */ +#define IEEE80211_ACTION_CAT_VENDOR_SPECIFIC_PROTECTED 126 /* 9.6.5 Vendor-specific Protected */ +#define IEEE80211_ACTION_CAT_VENDOR 127 /* 9.6.5 Vendor-specific */ +/* Error 128-255 */ + + +/* 80211-2020 Table 9-346-Spectrum Management Action field values */ +enum ieee80211_action_sm { + IEEE80211_ACTION_SM_SMREQ = 0, /* Spectrum Measurement Request */ + IEEE80211_ACTION_SM_SMREP = 1, /* Spectrum Measurement Report */ + IEEE80211_ACTION_SM_TPCREQ = 2, /* TPC Request */ + IEEE80211_ACTION_SM_TPCREP = 3, /* TPC Report */ + IEEE80211_ACTION_SM_CSA = 4, /* Channel Switch Announcement */ + /* Reserved = 5-255 */ +}; + +/* 80211-2020 Table 9-363-Radio Measurement Action field values */ +enum ieee80211_action_radio_measurement { + IEEE80211_ACTION_RADIO_MEASUREMENT_RMREQ = 0, /* Radio Measurement Request */ + IEEE80211_ACTION_RADIO_MEASUREMENT_RMREP = 1, /* Radio Measurement Report */ + IEEE80211_ACTION_RADIO_MEASUREMENT_LMREQ = 2, /* Link Measurement Request */ + IEEE80211_ACTION_RADIO_MEASUREMENT_LMREP = 3, /* Link Measurement Report */ + IEEE80211_ACTION_RADIO_MEASUREMENT_NRREQ = 4, /* Neighbor Report Request */ + IEEE80211_ACTION_RADIO_MEASUREMENT_NRRESP = 5, /* Neighbor Report Response */ + /* Reserved = 6-255 */ +}; #define IEEE80211_ACTION_HT_TXCHWIDTH 0 /* recommended xmit chan width*/ #define IEEE80211_ACTION_HT_MIMOPWRSAVE 1 /* MIMO power save */