From nobody Sat Sep 3 21:21:11 2022 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 4MKnlD27Mhz4bZYN; Sat, 3 Sep 2022 21:21:12 +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 4MKnlD1f5Zz49S7; Sat, 3 Sep 2022 21:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662240072; 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=PWzmqpCJ/uZfTTJ59fQYTDAs6NhWPGGJVDqdiwUpIoE=; b=tG8FBcWIsg9UbNIhBzmGJrcNtMVxn3qT+l7YZsyiMsYp0SPvo/NyE2oLEFouY8wnA9qxVn VjfGZ+8V4LW3Su5DMIQJP1UraYKgMJoGEhHy82bN1zZRq8IsoVeOxJe9Z5T9x5VfGbPP6T wpEuT/8PM5jOtWFJy8IcUA28EN3XBtRie+QcKqhNAOLLlv5tPy2dCA3yPHfKbmj4rm3sCg DCXEasI/Pyz/YkIpWNAFNgl8EjYgNHKBRRWUuuciZMmwuWbT4BDTPfAMOalrSwqX7EcnUh nnyFmRPTy7hTxXQzWMohMWG0yGTd4xpLp+z1zE3736/bJiOle9IE7Uo+Eyaagw== 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 4MKnlD0hvhzGnK; Sat, 3 Sep 2022 21:21:12 +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 283LLCxf095263; Sat, 3 Sep 2022 21:21:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 283LLBg2095262; Sat, 3 Sep 2022 21:21:11 GMT (envelope-from git) Date: Sat, 3 Sep 2022 21:21:11 GMT Message-Id: <202209032121.283LLBg2095262@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: fb47649ebc5a - main - net80211: update (parts of) frame types and subtypes and annotate 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: fb47649ebc5a667739e8bd834b993af3c8d1b89f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662240072; 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=PWzmqpCJ/uZfTTJ59fQYTDAs6NhWPGGJVDqdiwUpIoE=; b=hEp6/wkwe4mHiB0LGqFX+h3Da3KDXz+tCBwo5jeGvjlVn+aWla4fdL7Ts53NrdOi66sKf4 ocH8ypQw4e4OK98DyU0f1WCSAzOVbv4J4472mdi78wV/BpUz+Rk8ooUHOjn2TQ6Q7Ve84l 4Yymsw/gJFEZ1TvkozcGrAkxC3O6IV6dd+/6iNukOVP0lahGhKaibBSuxlldVqyPdZprkx gMy2oiyRpnXnirtvAA/TSYQzaFF5sSKRZUZJHUS/JFnGQtK0ZLK+koVtUcBLMWXcSkUezq z6qJnp1giEarWQBpLKLrixAXHVOFro2r0vkffdWXZsfBH1J4jmHOcauRM1Et3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662240072; a=rsa-sha256; cv=none; b=E8PkOLeBzwYWrKu574HwMfjqYmhRxhsOOojRMvzgidWW8OQzSf6skyc+/UkkAcxmq7PJZg FIcpCHOQXvCoCHIlBozAVZX3+20Hs0w2nlY9Gl7+v8pOsrclsaDzY4QYI5zBYWCO+MsKCQ fKU8judpUKJnf5I00+xzkwtL+sMAbC1EZBXcqpua3AGwaUHyAUUSVIvOBVRd7XUN+KhNko 9107eTaTgvS+FJuTgTJQQwzpRfXnJUh+2LkwMQNPKizkeb9DYnMBVk0kV0wtKdJzhKzkOW 1Gt82HkxLG9LNqA+hDqj/crIn8xsF2flw8B2TSZMliCFwqmhHpFIxK73edZIhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb47649ebc5a667739e8bd834b993af3c8d1b89f commit fb47649ebc5a667739e8bd834b993af3c8d1b89f Author: Bjoern A. Zeeb AuthorDate: 2022-08-31 22:26:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-03 21:18:40 +0000 net80211: update (parts of) frame types and subtypes and annotate Update to the full list of frame type and subtype values based on 802.11-2020 with 11ax and 11ay extensions. This includes the 4th type "Extension" (IEEE80211_FC0_TYPE_EXT). While here annotate them with descriptions which should help matching names (as at times things get confusing with LinuxKPI). Also remove some 802.11-1997 values Reserved nowadays. No functional changes. Sponsored by: The FreeBSD Foundation MFC after: 5 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D36410 --- sys/net80211/ieee80211.h | 117 ++++++++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 43 deletions(-) diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 461bc43264f7..efd07389341a 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -117,52 +117,80 @@ struct ieee80211_qosframe_addr4 { #define IEEE80211_FC0_VERSION_0 0x00 #define IEEE80211_FC0_TYPE_MASK 0x0c #define IEEE80211_FC0_TYPE_SHIFT 2 -#define IEEE80211_FC0_TYPE_MGT 0x00 -#define IEEE80211_FC0_TYPE_CTL 0x04 -#define IEEE80211_FC0_TYPE_DATA 0x08 +#define IEEE80211_FC0_TYPE_MGT 0x00 /* Management */ +#define IEEE80211_FC0_TYPE_CTL 0x04 /* Control */ +#define IEEE80211_FC0_TYPE_DATA 0x08 /* Data */ +#define IEEE80211_FC0_TYPE_EXT 0x0c /* Extension */ #define IEEE80211_FC0_SUBTYPE_MASK 0xf0 #define IEEE80211_FC0_SUBTYPE_SHIFT 4 -/* for TYPE_MGT */ -#define IEEE80211_FC0_SUBTYPE_ASSOC_REQ 0x00 -#define IEEE80211_FC0_SUBTYPE_ASSOC_RESP 0x10 -#define IEEE80211_FC0_SUBTYPE_REASSOC_REQ 0x20 -#define IEEE80211_FC0_SUBTYPE_REASSOC_RESP 0x30 -#define IEEE80211_FC0_SUBTYPE_PROBE_REQ 0x40 -#define IEEE80211_FC0_SUBTYPE_PROBE_RESP 0x50 -#define IEEE80211_FC0_SUBTYPE_TIMING_ADV 0x60 -#define IEEE80211_FC0_SUBTYPE_BEACON 0x80 -#define IEEE80211_FC0_SUBTYPE_ATIM 0x90 -#define IEEE80211_FC0_SUBTYPE_DISASSOC 0xa0 -#define IEEE80211_FC0_SUBTYPE_AUTH 0xb0 -#define IEEE80211_FC0_SUBTYPE_DEAUTH 0xc0 -#define IEEE80211_FC0_SUBTYPE_ACTION 0xd0 -#define IEEE80211_FC0_SUBTYPE_ACTION_NOACK 0xe0 -/* for TYPE_CTL */ -#define IEEE80211_FC0_SUBTYPE_TRIGGER 0x20 -#define IEEE80211_FC0_SUBTYPE_CONTROL_WRAP 0x70 -#define IEEE80211_FC0_SUBTYPE_BAR 0x80 -#define IEEE80211_FC0_SUBTYPE_BA 0x90 -#define IEEE80211_FC0_SUBTYPE_PS_POLL 0xa0 -#define IEEE80211_FC0_SUBTYPE_RTS 0xb0 -#define IEEE80211_FC0_SUBTYPE_CTS 0xc0 -#define IEEE80211_FC0_SUBTYPE_ACK 0xd0 -#define IEEE80211_FC0_SUBTYPE_CF_END 0xe0 -#define IEEE80211_FC0_SUBTYPE_CF_END_ACK 0xf0 -/* for TYPE_DATA (bit combination) */ -#define IEEE80211_FC0_SUBTYPE_DATA 0x00 -#define IEEE80211_FC0_SUBTYPE_CF_ACK 0x10 -#define IEEE80211_FC0_SUBTYPE_CF_POLL 0x20 -#define IEEE80211_FC0_SUBTYPE_CF_ACPL 0x30 -#define IEEE80211_FC0_SUBTYPE_NODATA 0x40 -#define IEEE80211_FC0_SUBTYPE_CFACK 0x50 -#define IEEE80211_FC0_SUBTYPE_CFPOLL 0x60 -#define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70 -#define IEEE80211_FC0_SUBTYPE_QOS_DATA 0x80 -#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFACK 0x90 -#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFPOLL 0xa0 -#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFACKPOLL 0xb0 -#define IEEE80211_FC0_SUBTYPE_QOS_NULL 0xc0 +/* 802.11-2020 Table 9-1-Valid type and subtype combinations */ +/* For type 00 Management (IEEE80211_FC0_TYPE_MGT) */ +#define IEEE80211_FC0_SUBTYPE_ASSOC_REQ 0x00 /* Association Request */ +#define IEEE80211_FC0_SUBTYPE_ASSOC_RESP 0x10 /* Association Response */ +#define IEEE80211_FC0_SUBTYPE_REASSOC_REQ 0x20 /* Reassociation Request */ +#define IEEE80211_FC0_SUBTYPE_REASSOC_RESP 0x30 /* Reassociation Response */ +#define IEEE80211_FC0_SUBTYPE_PROBE_REQ 0x40 /* Probe Request */ +#define IEEE80211_FC0_SUBTYPE_PROBE_RESP 0x50 /* Probe Response */ +#define IEEE80211_FC0_SUBTYPE_TIMING_ADV 0x60 /* Timing Advertisement */ +/* 0111 Reserved 0x70 */ +#define IEEE80211_FC0_SUBTYPE_BEACON 0x80 /* Beacon */ +#define IEEE80211_FC0_SUBTYPE_ATIM 0x90 /* ATIM */ +#define IEEE80211_FC0_SUBTYPE_DISASSOC 0xa0 /* Disassociation */ +#define IEEE80211_FC0_SUBTYPE_AUTH 0xb0 /* Authentication */ +#define IEEE80211_FC0_SUBTYPE_DEAUTH 0xc0 /* Deauthentication */ +#define IEEE80211_FC0_SUBTYPE_ACTION 0xd0 /* Action */ +#define IEEE80211_FC0_SUBTYPE_ACTION_NOACK 0xe0 /* Action No Ack */ +/* 1111 Reserved 0xf0 */ +/* For type 01 Control (IEEE80211_FC0_TYPE_CTL) */ +/* 0000-0001 Reserved 0x00-0x10 */ +#define IEEE80211_FC0_SUBTYPE_TRIGGER 0x20 /* Trigger, 80211ax-2021 */ +#define IEEE80211_FC0_SUBTYPE_TACK 0x30 /* TACK */ +#define IEEE80211_FC0_SUBTYPE_BF_REPORT_POLL 0x40 /* Beamforming Report Poll */ +#define IEEE80211_FC0_SUBTYPE_VHT_HE_NDP 0x50 /* VHT/HE NDP Announcement, 80211ac/ax-2013/2021 */ +#define IEEE80211_FC0_SUBTYPE_CTL_EXT 0x60 /* Control Frame Extension */ +#define IEEE80211_FC0_SUBTYPE_CONTROL_WRAP 0x70 /* Control Wrapper */ +#define IEEE80211_FC0_SUBTYPE_BAR 0x80 /* Block Ack Request (BlockAckReq) */ +#define IEEE80211_FC0_SUBTYPE_BA 0x90 /* Block Ack (BlockAck) */ +#define IEEE80211_FC0_SUBTYPE_PS_POLL 0xa0 /* PS-Poll */ +#define IEEE80211_FC0_SUBTYPE_RTS 0xb0 /* RTS */ +#define IEEE80211_FC0_SUBTYPE_CTS 0xc0 /* CTS */ +#define IEEE80211_FC0_SUBTYPE_ACK 0xd0 /* Ack */ +#define IEEE80211_FC0_SUBTYPE_CF_END 0xe0 /* CF-End */ +#define IEEE80211_FC0_SUBTYPE_CF_END_ACK 0xf0 /* 1111 Reserved - what was CF_END_ACK? */ +/* For type 10 Data (IEEE80211_FC0_TYPE_DATA) */ +#define IEEE80211_FC0_SUBTYPE_DATA 0x00 /* Data */ +/* 0001-0011 Reserved 0x10-0x30 */ /* Were: CF_ACK, CF_POLL, CF_ACPL */ +#define IEEE80211_FC0_SUBTYPE_NODATA 0x40 /* Null */ +/* 0101-0111 Reserved 0x50-0x70 */ /* Were: CFACK, CFPOLL, CF_ACK_CF_ACK */ +#define IEEE80211_FC0_SUBTYPE_QOS_DATA 0x80 /* QoS Data */ +#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFACK 0x90 /* QoS Data +CF-Ack */ +#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFPOLL 0xa0 /* QoS Data +CF-Poll */ +#define IEEE80211_FC0_SUBTYPE_QOS_DATA_CFACKPOLL 0xb0 /* QoS Data +CF-Ack +CF-Poll */ +#define IEEE80211_FC0_SUBTYPE_QOS_NULL 0xc0 /* QoS Null */ +/* 1101 Reserved 0xd0 */ +#define IEEE80211_FC0_SUBTYPE_QOS_CFPOLL 0xe0 /* QoS CF-Poll */ +#define IEEE80211_FC0_SUBTYPE_QOS_CFACKPOLL 0xf0 /* QoS CF-Ack +CF-Poll */ +/* For type 11 Extension (IEEE80211_FC0_TYPE_EXT) */ +#define IEEE80211_FC0_SUBTYPE_DMG_BEACON 0x00 /* DMG Beacon */ +#define IEEE80211_FC0_SUBTYPE_S1G_BEACON 0x10 /* S1G Beacon */ +/* 0010-1111 Reserved 0x20-0xff */ + +/* 802.11-2020 Table 9-2-Control Frame Extension */ +/* Reusing B11..B8, part of FC1 */ +#define IEEE80211_CTL_EXT_SECTOR_ACK 0x00 /* Sector Ack, 80211ay-2021 */ +#define IEEE80211_CTL_EXT_BA_SCHED 0x01 /* Block Ack Schedule, 80211ay-2021 */ +#define IEEE80211_CTL_EXT_POLL 0x02 /* Poll */ +#define IEEE80211_CTL_EXT_SPR 0x03 /* SPR */ +#define IEEE80211_CTL_EXT_GRANT 0x04 /* Grant */ +#define IEEE80211_CTL_EXT_DMG_CTS 0x05 /* DMG CTS */ +#define IEEE80211_CTL_EXT_DMG_DTS 0x06 /* DMG DTS */ +#define IEEE80211_CTL_EXT_GRANT_ACK 0x07 /* Grant Ack */ +#define IEEE80211_CTL_EXT_SSW 0x08 /* SSW */ +#define IEEE80211_CTL_EXT_SSW_FBACK 0x09 /* SSW-Feedback */ +#define IEEE80211_CTL_EXT_SSW_ACK 0x0a /* SSW-Ack */ +#define IEEE80211_CTL_EXT_TDD_BF 0x0b /* TDD Beamforming, 80211ay-2021 */ +/* 1100-1111 Reserved 0xc-0xf */ #define IEEE80211_IS_MGMT(wh) \ (!! (((wh)->i_fc[0] & IEEE80211_FC0_TYPE_MASK) \ @@ -173,6 +201,9 @@ struct ieee80211_qosframe_addr4 { #define IEEE80211_IS_DATA(wh) \ (!! (((wh)->i_fc[0] & IEEE80211_FC0_TYPE_MASK) \ == IEEE80211_FC0_TYPE_DATA)) +#define IEEE80211_IS_EXT(wh) \ + (!! (((wh)->i_fc[0] & IEEE80211_FC0_TYPE_MASK) \ + == IEEE80211_FC0_TYPE_EXT)) #define IEEE80211_FC0_QOSDATA \ (IEEE80211_FC0_TYPE_DATA|IEEE80211_FC0_SUBTYPE_QOS_DATA|IEEE80211_FC0_VERSION_0)