From nobody Sat May 20 01:01:01 2023 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 4QNQPn3nbYz4CZxS; Sat, 20 May 2023 01:01:01 +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 4QNQPn3Ld8z43mf; Sat, 20 May 2023 01:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684544461; 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=20RDR9nMk0rIlaoKLhahgdwPBd/4YYZKAiirWVDW9vY=; b=GqM8LxBWy0i/mnaWCi4MdGovPxKUpzuMi8uVmptshDgKNa9N0EhDXW/RERCu5UgKGMXy8m sCdgTeGkKfDU6wOjoXY0WN9c1jeuJh5manGgqx5UEDL1285QiklRc6fHFl3pv38M9dbjBa NCVQwioIiH7aVyJmoFe64pWMGTAde8kwWck1a8FsUziUq9vgqmbJaspGIn4yLEkNXeNxuh +fbfGovnW+nN+t4cyAAG4Ix/PItbod5wUGhSZJ7vCLjaMXk1W3ft4ZNAwfkproKkCPUA9l BFXY3w8aQcLxa7zcxss/0bXyySHG6jnwmyM5i4QF92E+ilLIAwEHK98w0AL+GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684544461; 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=20RDR9nMk0rIlaoKLhahgdwPBd/4YYZKAiirWVDW9vY=; b=eRmATPX5PGMdicX4EiZognCbFcAYY6u9hdf22GUM1g8Fox+Nr1gmrc/UOFkOCVf9nNuaPv +a3eipqg1HO3LNlUqDq8haIe90NCaXhqxBxSI/uUDgFGGaKB2/m0Lmx9SaKQIyreJK7Pw9 dGVcYWEm7MtTjWimvquPVktw6MXS5RsilyhgZDnHZxUxF4ODDgo2SX0fpeTCP2S41YmbYv 0MP9hBTYlCu68IyW0uuibgJCCdSgqyIgLlicCLxdh/BeYS2BsNm/GoNp05G61LyFWFgFlq TOfHzDV8oos5ChvigkxVoh5oqmH97fooDZtoiCuRv4P7hF06Mag+3v5BRaOtxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684544461; a=rsa-sha256; cv=none; b=aGhA/M77ZU4O6ei1N2PurXNmlkGn9PftQYsse5oxSxpxHB35FXaBp9DwfEHUr+QKmEDwdD IAL8/Bzu+CGPCR2G3qgeKa5zk9Wtv0fRILUDiMqFEmnZUzQXtTHEQJnyl2jOet98NbZgFS Zd5LuXkzsBc5UBZZgysZJd1rhKUPXTW5/dJCeCLwc6H/hQKXAIUQaf1FmrXmRX294WRSAe pGUAm2tp1FdMRLRzGmIpMUi/7vB0dTFbOlZLwX2gKtjXRaPYaSxM1LSRfqmzNE2HVY9MtV g2l+FRHmQcDsoBPj826cu3nlP051e0amkfrPnOoaeA/NHQN1i+rZWNG6PpYUSg== 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 4QNQPn2QjkzqJ8; Sat, 20 May 2023 01:01:01 +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 34K111tJ077073; Sat, 20 May 2023 01:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34K111tl077067; Sat, 20 May 2023 01:01:01 GMT (envelope-from git) Date: Sat, 20 May 2023 01:01:01 GMT Message-Id: <202305200101.34K111tl077067@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: 63231f4d5bae - main - net80211: Radiotap: update for defines 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: 63231f4d5bae5fbdb2ebbca4860416557c397059 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=63231f4d5bae5fbdb2ebbca4860416557c397059 commit 63231f4d5bae5fbdb2ebbca4860416557c397059 Author: Bjoern A. Zeeb AuthorDate: 2023-05-20 00:39:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-20 00:56:21 +0000 net80211: Radiotap: update for defines ath1xk drivers require further HE defines. Some of those we had already predicted as comments in the past. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/net80211/ieee80211_radiotap.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h index bd54690ee2ec..1515ce7afd34 100644 --- a/sys/net80211/ieee80211_radiotap.h +++ b/sys/net80211/ieee80211_radiotap.h @@ -431,7 +431,7 @@ struct ieee80211_radiotap_he { #define IEEE80211_RADIOTAP_HE_DATA2_TXBF_KNOWN 0x0010 #define IEEE80211_RADIOTAP_HE_DATA2_PE_DISAMBIG_KNOWN 0x0020 #define IEEE80211_RADIOTAP_HE_DATA2_TXOP_KNOWN 0x0040 -/* #define IEEE80211_RADIOTAP_HE_DATA2_ midamble periodicity _KNOWN 0x0080 */ +#define IEEE80211_RADIOTAP_HE_DATA2_MIDAMBLE_KNOWN 0x0080 #define IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET 0x3F00 #define IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET_KNOWN 0x4000 #define IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_SEC 0x8000 @@ -439,11 +439,11 @@ struct ieee80211_radiotap_he { #define IEEE80211_RADIOTAP_HE_DATA3_BSS_COLOR 0x003F #define IEEE80211_RADIOTAP_HE_DATA3_BEAM_CHANGE 0x0040 #define IEEE80211_RADIOTAP_HE_DATA3_UL_DL 0x0080 -/* #deifne IEEE80211_RADIOTAP_HE_DATA3_data_MCS 0x0F00 */ -/* #define IEEE80211_RADIOTAP_HE_DATA3_data_DCM 0x1000 */ -/* #define IEEE80211_RADIOTAP_HE_DATA3_Coding 0x2000 */ +#define IEEE80211_RADIOTAP_HE_DATA3_DATA_MCS 0x0F00 +#define IEEE80211_RADIOTAP_HE_DATA3_DATA_DCM 0x1000 +#define IEEE80211_RADIOTAP_HE_DATA3_CODING 0x2000 #define IEEE80211_RADIOTAP_HE_DATA3_LDPC_XSYMSEG 0x4000 -/* #define IEEE80211_RADIOTAP_HE_DATA3_STBC 0x8000 */ +#define IEEE80211_RADIOTAP_HE_DATA3_STBC 0x8000 #define IEEE80211_RADIOTAP_HE_DATA4_SU_MU_SPTL_REUSE 0x000F #define IEEE80211_RADIOTAP_HE_DATA4_MU_STA_ID 0x7FF0 @@ -452,6 +452,8 @@ struct ieee80211_radiotap_he { #define IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE3 0x0F00 #define IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE4 0xF000 +#define IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC 0x000F +#define IEEE80211_RADIOTAP_HE_DATA5_GI 0x0030 #define IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE 0x00C0 #define IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_UNKNOWN 0x0 #define IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X 0x1 @@ -462,6 +464,7 @@ struct ieee80211_radiotap_he { #define IEEE80211_RADIOTAP_HE_DATA5_TXBF 0x4000 #define IEEE80211_RADIOTAP_HE_DATA5_PE_DISAMBIG 0x8000 +#define IEEE80211_RADIOTAP_HE_DATA6_NSTS 0x000F #define IEEE80211_RADIOTAP_HE_DATA6_DOPPLER 0x0010 /* 0x00e0 (reserved) ; use these for the following undocumented. */ #define IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_KNOWN 0x0020