The branch stable/14 has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c4c77498a34c35ac4cccf300243e236a5296b1cb
commit c4c77498a34c35ac4cccf300243e236a5296b1cb
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2025-04-22 20:09:12 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2025-06-10 23:40:00 +0000
net80211: update IE list for 802.11-2020
Sponsored by: The FreeBSD Foundation
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D50673
(cherry picked from commit beb51893cc292f24b3284b1465a58cba4c3059d7)
---
sys/net80211/ieee80211.h | 76 +++++++++++++++++++++++++++++++++++-------------
1 file changed, 55 insertions(+), 21 deletions(-)
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index 40649dbe1886..16daeb530133 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -1032,9 +1032,11 @@ struct ieee80211_ie_vht_txpwrenv {
enum {
IEEE80211_ELEMID_SSID = 0,
IEEE80211_ELEMID_RATES = 1,
- IEEE80211_ELEMID_FHPARMS = 2,
+ /* 2 Reserved */
+ IEEE80211_ELEMID_FHPARMS = 2, /* remove? */
IEEE80211_ELEMID_DSPARMS = 3,
- IEEE80211_ELEMID_CFPARMS = 4,
+ /* 4 Reserved */
+ IEEE80211_ELEMID_CFPARMS = 4, /* remove? */
IEEE80211_ELEMID_TIM = 5,
IEEE80211_ELEMID_IBSSPARMS = 6,
IEEE80211_ELEMID_COUNTRY = 7,
@@ -1044,6 +1046,7 @@ enum {
IEEE80211_ELEMID_EDCA_PARAM_SET = 12,
IEEE80211_ELEMID_TSPEC = 13,
IEEE80211_ELEMID_TCLAS = 14,
+ IEEE80211_ELEMID_SCHEDULE = 15,
IEEE80211_ELEMID_CHALLENGE = 16,
/* 17-31 reserved for challenge text extension */
IEEE80211_ELEMID_PWRCNSTR = 32,
@@ -1061,6 +1064,7 @@ enum {
IEEE80211_ELEMID_TCLAS_PROCES = 44,
IEEE80211_ELEMID_HTCAP = 45,
IEEE80211_ELEMID_QOS = 46,
+ /* 47 reserved */
IEEE80211_ELEMID_RESERVED_47 = 47,
IEEE80211_ELEMID_RSN = 48,
/* 49 reserved */
@@ -1068,31 +1072,30 @@ enum {
IEEE80211_ELEMID_APCHANREP = 51,
IEEE80211_ELEMID_NEIGHBOR_REP = 52,
IEEE80211_ELEMID_RCPI = 53,
- IEEE80211_ELEMID_MOBILITY_DOMAIN = 54,
+ IEEE80211_ELEMID_MOBILITY_DOMAIN = 54, /* MDE */
IEEE80211_ELEMID_FAST_BSS_TRANS = 55, /* FTE */
IEEE80211_ELEMID_TIMEOUT_INTVL = 56,
IEEE80211_ELEMID_RIC_DATA = 57, /* RDE */
IEEE80211_ELEMID_DSE_REG_LOC = 58,
IEEE80211_ELEMID_SUP_OP_CLASS = 59,
- IEEE80211_ELEMID_EXT_CHAN_SW_A = 60,
- IEEE80211_ELEMID_HTINFO = 61,
+ IEEE80211_ELEMID_EXT_CSA = 60,
+ IEEE80211_ELEMID_HTINFO = 61, /* HTOPER */
IEEE80211_ELEMID_SECCHAN_OFFSET = 62,
- IEEE80211_ELEMID_BSS_AVG_D_ACC = 63,
+ IEEE80211_ELEMID_BSS_AVG_ACC_DELAY = 63,
IEEE80211_ELEMID_ANTENNA = 64,
IEEE80211_ELEMID_RSNI = 65,
IEEE80211_ELEMID_MEAS_PILOT_TRANS = 66,
IEEE80211_ELEMID_BSS_AVAIL_AD_CAP = 67,
- IEEE80211_ELEMID_BSS_AC_ACC_D = 68,
+ IEEE80211_ELEMID_BSS_AC_ACC_DELAY = 68,
IEEE80211_ELEMID_TIME_ADV = 69,
- IEEE80211_ELEMID_RRM_ENACAPS = 70,
+ IEEE80211_ELEMID_RRM_ENACAPS = 70, /* RM_ENCAPS */
IEEE80211_ELEMID_MULTIBSSID = 71,
IEEE80211_ELEMID_COEX_2040 = 72,
- IEEE80211_ELEMID_INTOL_CHN_REPORT = 73,
+ IEEE80211_ELEMID_2040_INTOL_CHAN_REPORT = 73,
IEEE80211_ELEMID_OVERLAP_BSS_SCAN_PARAM = 74,
IEEE80211_ELEMID_RIC_DESC = 75,
IEEE80211_ELEMID_MGMT_MIC = 76,
- IEEE80211_ELEMID_MMIC = 76, /* To be removed */
- /* = 77, */
+ /* 77 reserved */
IEEE80211_ELEMID_EVENT_REQ = 78,
IEEE80211_ELEMID_EVENT_REP = 79,
IEEE80211_ELEMID_DIAGNOSTIC_REQ = 80,
@@ -1100,7 +1103,7 @@ enum {
IEEE80211_ELEMID_LOCATION_PARAM = 82,
IEEE80211_ELEMID_NONTRANS_BSSID_CAP = 83,
IEEE80211_ELEMID_SSID_LIST = 84,
- IEEE80211_ELEMID_MULTI_BSS_ID = 85,
+ IEEE80211_ELEMID_MULTI_BSSID_IDX = 85,
IEEE80211_ELEMID_FMS_DESC = 86,
IEEE80211_ELEMID_FMS_REQ = 87,
IEEE80211_ELEMID_FMS_RESP = 88,
@@ -1118,7 +1121,7 @@ enum {
IEEE80211_ELEMID_DMS_RESP = 100,
IEEE80211_ELEMID_LINK_ID = 101,
IEEE80211_ELEMID_WAKEUP_SCHED = 102,
- /* = 103, */
+ /* 103 reserved */
IEEE80211_ELEMID_CHAN_SW_TIMING = 104,
IEEE80211_ELEMID_PTI_CONTROL = 105,
IEEE80211_ELEMID_TPU_BUF_STATUS = 106,
@@ -1170,7 +1173,6 @@ enum {
IEEE80211_ELEMID_DMG_CAP = 148,
/* 149-150 reserved. */
IEEE80211_ELEMID_TPC = 150, /* XXX: remove */
-
IEEE80211_ELEMID_DMG_OPER = 151,
IEEE80211_ELEMID_DMG_BSS_PARAM_CHANGE = 152,
IEEE80211_ELEMID_DMG_BEAM_REF = 153,
@@ -1180,13 +1182,12 @@ enum {
IEEE80211_ELEMID_AWAKE_WIN = 157,
IEEE80211_ELEMID_MULTI_BAND = 158,
IEEE80211_ELEMID_ADDBA_EXT = 159,
-
IEEE80211_ELEMID_NEXTPCP_LIST = 160,
IEEE80211_ELEMID_PCP_HANDOVER = 161,
IEEE80211_ELEMID_DMG_LINK_MARGIN = 162,
IEEE80211_ELEMID_SW_STREAM = 163,
IEEE80211_ELEMID_SESS_TRANS = 164,
- IEEE80211_ELEMID_DYN_TONE_PAIR_REP = 165,
+ /* 165 reserved. */
IEEE80211_ELEMID_CLUSTER_REP = 166,
IEEE80211_ELEMID_RELAY_CAP = 167,
IEEE80211_ELEMID_RELAY_TRANS_PARAM_SET = 168,
@@ -1210,12 +1211,10 @@ enum {
IEEE80211_ELEMID_HL_STREAM_ID = 188,
IEEE80211_ELEMID_GCR_GROUP_ADDR = 189,
IEEE80211_ELEMID_ANTENNA_SECTOR_ID_PAT = 190,
-
IEEE80211_ELEMID_VHT_CAP = 191,
IEEE80211_ELEMID_VHT_OPMODE = 192,
-
IEEE80211_ELEMID_EXTENDED_BSS_LOAD = 193,
- IEEE80211_ELEMID_WIDE_BW_CHANNEL_SWITCH = 194,
+ IEEE80211_ELEMID_WIDE_BW_CHAN_SW = 194,
IEEE80211_ELEMID_VHT_PWR_ENV = 195, /* TX_PWR_ENV */
IEEE80211_ELEMID_CHANNEL_SWITCH_WRAPPER = 196,
IEEE80211_ELEMID_AID = 197,
@@ -1228,9 +1227,44 @@ enum {
IEEE80211_ELEMID_DEVICE_LOC = 204,
IEEE80211_ELEMID_WHITE_SPACE_MAP = 205,
IEEE80211_ELEMID_FINE_TIME_MEAS_PARAM = 206,
- /* 207-220 reserved. */
+ IEEE80211_ELEMID_SIG_OPEN_LOOP_LINK_MARGIN_IDX = 207,
+ IEEE80211_ELEMID_RPS = 208,
+ IEEE80211_ELEMID_PAGE_SLICE = 209,
+ IEEE80211_ELEMID_AID_REQ = 210,
+ IEEE80211_ELEMID_AID_RESP = 211,
+ IEEE80211_ELEMID_SIG_SECTOR_OP = 212,
+ IEEE80211_ELEMID_SIG_BEACON_COMPAT = 213,
+ IEEE80211_ELEMID_SHORT_BEACON_INTVL = 214,
+ IEEE80211_ELEMID_CHANGE_SEQ = 215,
+ IEEE80211_ELEMID_TWT = 216,
+ IEEE80211_ELEMID_SIG_CAPS = 217,
+ /* 218-219 reserved. */
+ IEEE80211_ELEMID_SUBCHAN_SELECT_TRANS = 220,
IEEE80211_ELEMID_VENDOR = 221, /* vendor private */
- /* 222-254 reserved. */
+ IEEE80211_ELEMID_AUTH_CONTROL = 222,
+ IEEE80211_ELEMID_TSF_TIMER_ACC = 223,
+ IEEE80211_ELEMID_S1G_RELAY = 224,
+ IEEE80211_ELEMID_REACHABLE_ADDR = 225,
+ IEEE80211_ELEMID_SIG_RELAY_DISC = 226,
+ /* 227 reserved. */
+ IEEE80211_ELEMID_AID_ANNOUNCEMENT = 228,
+ IEEE80211_ELEMID_PV1_PROBE_RESP_OPT = 229,
+ IEEE80211_ELEMID_EL_OP = 230,
+ IEEE80211_ELEMID_SECTORIZED_GRP_ID_LIST = 231,
+ IEEE80211_ELEMID_SIG_OP = 232,
+ IEEE80211_ELEMID_HDR_COMPRESSION = 233,
+ IEEE80211_ELEMID_SST_OP = 234,
+ IEEE80211_ELEMID_MAD = 235,
+ IEEE80211_ELEMID_SIG_RELAY_ACT = 236,
+ IEEE80211_ELEMID_CAG_NUMBER = 237,
+ /* 238 reserved. */
+ IEEE80211_ELEMID_AP_CSN = 239,
+ IEEE80211_ELEMID_FILS_INDICATION = 240,
+ IEEE80211_ELEMID_DILS = 241,
+ IEEE80211_ELEMID_FRAGMENT = 242,
+ /* 243 reserved. */
+ IEEE80211_ELEMID_RSN_EXT = 244,
+ /* 245-254 reserved. */
IEEE80211_ELEMID_EXTFIELD = 255
};
