net80211: Radiotap: update for newer standards (add EHT, U-SIG)
iwlwifi already uses suggested EHT and U-SIG bits as well as some more TLV bits. Update radiotap to know of those even if they might get updated again in the future in order to get newer versions of the driver to compile. Sponsored by: The FreeBSD Foundation MFC after: 10 days
This commit is contained in:
Bjoern A. Zeeb
parent
584ad4126c
commit
7232e6dcc8
@ -234,9 +234,13 @@ enum ieee80211_radiotap_type {
|
||||
IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
|
||||
IEEE80211_RADIOTAP_VHT = 21,
|
||||
|
||||
IEEE80211_RADIOTAP_TLV = 28,
|
||||
IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
|
||||
IEEE80211_RADIOTAP_VENDOREXT = 30,
|
||||
IEEE80211_RADIOTAP_VENDOREXT = 30, /* obsolete? */
|
||||
IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
|
||||
IEEE80211_RADIOTAP_EXT = 31,
|
||||
IEEE80211_RADIOTAP_EHT_USIG = 33,
|
||||
IEEE80211_RADIOTAP_EHT = 34,
|
||||
};
|
||||
|
||||
#ifndef _KERNEL
|
||||
@ -381,10 +385,25 @@ enum ieee80211_radiotap_type {
|
||||
#define IEEE80211_RADIOTAP_ZERO_LEN_PSDU_NOT_CAPTURED 0x01
|
||||
#define IEEE80211_RADIOTAP_ZERO_LEN_PSDU_VENDOR 0xFF
|
||||
|
||||
/* http://www.radiotap.org/fields/TLV.html */
|
||||
struct ieee80211_radiotap_tlv {
|
||||
uint16_t type;
|
||||
uint16_t len;
|
||||
uint8_t data[];
|
||||
} __packed;
|
||||
|
||||
struct ieee80211_radiotap_vendor_content {
|
||||
uint8_t oui[3];
|
||||
uint8_t oui_subtype;
|
||||
uint16_t vendor_type;
|
||||
uint16_t __padding;
|
||||
uint8_t data[];
|
||||
} __packed;
|
||||
|
||||
/* https://www.radiotap.org/fields/HE.html */
|
||||
struct ieee80211_radiotap_he {
|
||||
uint16_t data1, data2, data3, data4, data5, data6;
|
||||
};
|
||||
} __packed;
|
||||
|
||||
#define IEEE80211_RADIOTAP_HE_DATA1_FORMAT_SU 0x0000
|
||||
#define IEEE80211_RADIOTAP_HE_DATA1_FORMAT_EXT_SU 0x0001
|
||||
@ -459,7 +478,7 @@ struct ieee80211_radiotap_he_mu {
|
||||
uint16_t flags2;
|
||||
uint8_t ru_ch1[4];
|
||||
uint8_t ru_ch2[4];
|
||||
};
|
||||
} __packed;
|
||||
|
||||
#define IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_MCS 0x000F
|
||||
#define IEEE80211_RADIOTAP_HE_MU_FLAGS1_SIG_B_MCS_KNOWN 0x0010
|
||||
@ -490,7 +509,7 @@ struct ieee80211_radiotap_he_mu {
|
||||
struct ieee80211_radiotap_lsig {
|
||||
uint16_t data1;
|
||||
uint16_t data2;
|
||||
};
|
||||
} __packed;
|
||||
#define IEEE80211_RADIOTAP_LSIG_DATA1_LENGTH_KNOWN 0x0002
|
||||
|
||||
#define IEEE80211_RADIOTAP_LSIG_DATA2_LENGTH 0xFFF0
|
||||
@ -503,4 +522,109 @@ struct ieee80211_radiotap_lsig {
|
||||
#define IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US 0x01
|
||||
#define IEEE80211_RADIOTAP_TIMESTAMP_SPOS_PLCP_SIG_ACQ 0x10
|
||||
|
||||
/* http://www.radiotap.org/fields/U-SIG.html */
|
||||
struct ieee80211_radiotap_eht_usig {
|
||||
uint32_t common;
|
||||
uint32_t value;
|
||||
uint32_t mask;
|
||||
} __packed;
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER_KNOWN 0x00000001
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN 0x00000002
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL_KNOWN 0x00000004
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN 0x00000008
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN 0x00000010
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC 0x00000020
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER 0x00007000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW 0x00038000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL 0x00040000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR 0x01f80000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP 0xfe000000
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG1_MU_B20_B24_DISREGARD 0x0000001f
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG1_MU_B25_VALIDATE 0x00000020
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_MU_B0_B1_PPDU_TYPE 0x000000c0
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_MU_B2_VALIDATE 0x00000100
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_MU_B3_B7_PUNCTURED_INFO 0x00003e00
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_MU_B8_VALIDATE 0x00004000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_MU_B9_B10_SIG_MCS 0x00018000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_MU_B11_B15_EHT_SIG_SYMBOLS 0x003e0000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_MU_B16_B19_CRC 0x03c00000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_MU_B20_B25_TAIL 0xfc000000
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG1_TB_B20_B25_DISREGARD 0x0000003f
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_TB_B0_B1_PPDU_TYPE 0x000000c0
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_TB_B2_VALIDATE 0x00000100
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_TB_B3_B6_SPATIAL_REUSE_1 0x00001e00
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_TB_B7_B10_SPATIAL_REUSE_2 0x0001e000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_TB_B11_B15_DISREGARD 0x003e0000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_TB_B16_B19_CRC 0x03c00000
|
||||
#define IEEE80211_RADIOTAP_EHT_USIG2_TB_B20_B25_TAIL 0xfc000000
|
||||
|
||||
/* http://www.radiotap.org/fields/EHT.html */
|
||||
struct ieee80211_radiotap_eht {
|
||||
uint32_t known;
|
||||
uint32_t data[9];
|
||||
uint32_t user_info[];
|
||||
} __packed;
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE 0x00000002
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_GI 0x00000004
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF 0x00000010
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM 0x00000020
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM 0x00000040
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM 0x00000080
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S 0x00020000
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S 0x00040000
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_NR_NON_OFDMA_USERS_M 0x00080000
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_RU_ALLOC_TB_FMT 0x01000000
|
||||
#define IEEE80211_RADIOTAP_EHT_KNOWN_PRIMARY_80 0x02000000
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE 0x00000078
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA0_GI 0x00000180
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA0_LTF 0x00000600
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF 0x00003800
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM 0x00004000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM 0x00018000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM 0x00020000
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1 0x003fe000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1_KNOWN 0x00400000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA1_PRIMARY_80 0xc0000000
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_1 0x000001ff
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_1_KNOWN 0x00000200
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2 0x0007fc00
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2_KNOWN 0x00080000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_2 0x1ff00000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_2_KNOWN 0x20000000
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1 0x000001ff
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1_KNOWN 0x00000200
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_2_2_1 0x0007fc00
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_2_2_1_KNOWN 0x00080000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2 0x1ff00000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2_KNOWN 0x20000000
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2 0x000001ff
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2_KNOWN 0x00000200
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA7_NSS_S 0x0000f000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S 0x00010000
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA7_NUM_OF_NON_OFDMA_USERS 0x000e0000
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_PS_160 0x00000001
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B0 0x00000002
|
||||
#define IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1 0x000001fc
|
||||
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN 0x00000001
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN 0x00000002
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN 0x00000004
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O 0x00000010
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O 0x00000020
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_DATA_FOR_USER 0x00000080
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID 0x0007ff00
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_CODING 0x00080000
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_MCS 0x00f00000
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O 0x0f000000
|
||||
#define IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_O 0x20000000
|
||||
|
||||
#endif /* !_NET80211_IEEE80211_RADIOTAP_H_ */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user