git: 63231f4d5bae - main - net80211: Radiotap: update for defines
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 20 May 2023 01:01:01 UTC
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=63231f4d5bae5fbdb2ebbca4860416557c397059
commit 63231f4d5bae5fbdb2ebbca4860416557c397059
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2023-05-20 00:39:08 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
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