developer | 2e1f780 | 2022-06-15 19:48:25 +0800 | [diff] [blame^] | 1 | --- a/nl80211.h |
| 2 | +++ b/nl80211.h |
| 3 | @@ -11,7 +11,7 @@ |
| 4 | * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com> |
| 5 | * Copyright 2008 Colin McCabe <colin@cozybit.com> |
| 6 | * Copyright 2015-2017 Intel Deutschland GmbH |
| 7 | - * Copyright (C) 2018-2022 Intel Corporation |
| 8 | + * Copyright (C) 2018-2021 Intel Corporation |
| 9 | * |
| 10 | * Permission to use, copy, modify, and/or distribute this software for any |
| 11 | * purpose with or without fee is hereby granted, provided that the above |
| 12 | @@ -301,29 +301,6 @@ |
| 13 | */ |
| 14 | |
| 15 | /** |
| 16 | - * DOC: FILS shared key crypto offload |
| 17 | - * |
| 18 | - * This feature is applicable to drivers running in AP mode. |
| 19 | - * |
| 20 | - * FILS shared key crypto offload can be advertised by drivers by setting |
| 21 | - * @NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD flag. The drivers that support |
| 22 | - * FILS shared key crypto offload should be able to encrypt and decrypt |
| 23 | - * association frames for FILS shared key authentication as per IEEE 802.11ai. |
| 24 | - * With this capability, for FILS key derivation, drivers depend on userspace. |
| 25 | - * |
| 26 | - * After FILS key derivation, userspace shares the FILS AAD details with the |
| 27 | - * driver and the driver stores the same to use in decryption of association |
| 28 | - * request and in encryption of association response. The below parameters |
| 29 | - * should be given to the driver in %NL80211_CMD_SET_FILS_AAD. |
| 30 | - * %NL80211_ATTR_MAC - STA MAC address, used for storing FILS AAD per STA |
| 31 | - * %NL80211_ATTR_FILS_KEK - Used for encryption or decryption |
| 32 | - * %NL80211_ATTR_FILS_NONCES - Used for encryption or decryption |
| 33 | - * (STA Nonce 16 bytes followed by AP Nonce 16 bytes) |
| 34 | - * |
| 35 | - * Once the association is done, the driver cleans the FILS AAD data. |
| 36 | - */ |
| 37 | - |
| 38 | -/** |
| 39 | * enum nl80211_commands - supported nl80211 commands |
| 40 | * |
| 41 | * @NL80211_CMD_UNSPEC: unspecified command to catch errors |
| 42 | @@ -1226,17 +1203,6 @@ |
| 43 | * @NL80211_CMD_COLOR_CHANGE_COMPLETED: Notify userland that the color change |
| 44 | * has completed |
| 45 | * |
| 46 | - * @NL80211_CMD_SET_FILS_AAD: Set FILS AAD data to the driver using - |
| 47 | - * &NL80211_ATTR_MAC - for STA MAC address |
| 48 | - * &NL80211_ATTR_FILS_KEK - for KEK |
| 49 | - * &NL80211_ATTR_FILS_NONCES - for FILS Nonces |
| 50 | - * (STA Nonce 16 bytes followed by AP Nonce 16 bytes) |
| 51 | - * |
| 52 | - * @NL80211_CMD_ASSOC_COMEBACK: notification about an association |
| 53 | - * temporal rejection with comeback. The event includes %NL80211_ATTR_MAC |
| 54 | - * to describe the BSSID address of the AP and %NL80211_ATTR_TIMEOUT to |
| 55 | - * specify the timeout value. |
| 56 | - * |
| 57 | * @NL80211_CMD_MAX: highest used command number |
| 58 | * @__NL80211_CMD_AFTER_LAST: internal use |
| 59 | */ |
| 60 | @@ -1477,10 +1443,6 @@ enum nl80211_commands { |
| 61 | NL80211_CMD_COLOR_CHANGE_ABORTED, |
| 62 | NL80211_CMD_COLOR_CHANGE_COMPLETED, |
| 63 | |
| 64 | - NL80211_CMD_SET_FILS_AAD, |
| 65 | - |
| 66 | - NL80211_CMD_ASSOC_COMEBACK, |
| 67 | - |
| 68 | /* add new commands above here */ |
| 69 | |
| 70 | /* used to define NL80211_CMD_MAX below */ |
| 71 | @@ -2477,9 +2439,7 @@ enum nl80211_commands { |
| 72 | * space supports external authentication. This attribute shall be used |
| 73 | * with %NL80211_CMD_CONNECT and %NL80211_CMD_START_AP request. The driver |
| 74 | * may offload authentication processing to user space if this capability |
| 75 | - * is indicated in the respective requests from the user space. (This flag |
| 76 | - * attribute deprecated for %NL80211_CMD_START_AP, use |
| 77 | - * %NL80211_ATTR_AP_SETTINGS_FLAGS) |
| 78 | + * is indicated in the respective requests from the user space. |
| 79 | * |
| 80 | * @NL80211_ATTR_NSS: Station's New/updated RX_NSS value notified using this |
| 81 | * u8 attribute. This is used with %NL80211_CMD_STA_OPMODE_CHANGED. |
| 82 | @@ -2655,13 +2615,8 @@ enum nl80211_commands { |
| 83 | * switching on a different channel during CAC detection on the selected |
| 84 | * radar channel. |
| 85 | * |
| 86 | - * @NL80211_ATTR_AP_SETTINGS_FLAGS: u32 attribute contains ap settings flags, |
| 87 | - * enumerated in &enum nl80211_ap_settings_flags. This attribute shall be |
| 88 | - * used with %NL80211_CMD_START_AP request. |
| 89 | - * |
| 90 | - * @NL80211_ATTR_EHT_CAPABILITY: EHT Capability information element (from |
| 91 | - * association request when used with NL80211_CMD_NEW_STATION). Can be set |
| 92 | - * only if %NL80211_STA_FLAG_WME is set. |
| 93 | + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce |
| 94 | + * transmit power to stay within regulatory limits. u32, dBi. |
| 95 | * |
| 96 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 97 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 98 | @@ -3171,11 +3126,7 @@ enum nl80211_attrs { |
| 99 | |
| 100 | NL80211_ATTR_RADAR_BACKGROUND, |
| 101 | |
| 102 | - NL80211_ATTR_AP_SETTINGS_FLAGS, |
| 103 | - |
| 104 | - NL80211_ATTR_EHT_CAPABILITY, |
| 105 | - |
| 106 | - NL80211_ATTR_DISABLE_EHT, |
| 107 | + NL80211_ATTR_WIPHY_ANTENNA_GAIN, |
| 108 | |
| 109 | /* add attributes here, update the policy in nl80211.c */ |
| 110 | |
| 111 | @@ -3232,8 +3183,6 @@ enum nl80211_attrs { |
| 112 | #define NL80211_HE_MAX_CAPABILITY_LEN 54 |
| 113 | #define NL80211_MAX_NR_CIPHER_SUITES 5 |
| 114 | #define NL80211_MAX_NR_AKM_SUITES 2 |
| 115 | -#define NL80211_EHT_MIN_CAPABILITY_LEN 13 |
| 116 | -#define NL80211_EHT_MAX_CAPABILITY_LEN 51 |
| 117 | |
| 118 | #define NL80211_MIN_REMAIN_ON_CHANNEL_TIME 10 |
| 119 | |
| 120 | @@ -3261,7 +3210,7 @@ enum nl80211_attrs { |
| 121 | * and therefore can't be created in the normal ways, use the |
| 122 | * %NL80211_CMD_START_P2P_DEVICE and %NL80211_CMD_STOP_P2P_DEVICE |
| 123 | * commands to create and destroy one |
| 124 | - * @NL80211_IFTYPE_OCB: Outside Context of a BSS |
| 125 | + * @NL80211_IF_TYPE_OCB: Outside Context of a BSS |
| 126 | * This mode corresponds to the MIB variable dot11OCBActivated=true |
| 127 | * @NL80211_IFTYPE_NAN: NAN device interface type (not a netdev) |
| 128 | * @NL80211_IFTYPE_MAX: highest interface type number currently defined |
| 129 | @@ -3403,56 +3352,6 @@ enum nl80211_he_ru_alloc { |
| 130 | }; |
| 131 | |
| 132 | /** |
| 133 | - * enum nl80211_eht_gi - EHT guard interval |
| 134 | - * @NL80211_RATE_INFO_EHT_GI_0_8: 0.8 usec |
| 135 | - * @NL80211_RATE_INFO_EHT_GI_1_6: 1.6 usec |
| 136 | - * @NL80211_RATE_INFO_EHT_GI_3_2: 3.2 usec |
| 137 | - */ |
| 138 | -enum nl80211_eht_gi { |
| 139 | - NL80211_RATE_INFO_EHT_GI_0_8, |
| 140 | - NL80211_RATE_INFO_EHT_GI_1_6, |
| 141 | - NL80211_RATE_INFO_EHT_GI_3_2, |
| 142 | -}; |
| 143 | - |
| 144 | -/** |
| 145 | - * enum nl80211_eht_ru_alloc - EHT RU allocation values |
| 146 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_26: 26-tone RU allocation |
| 147 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_52: 52-tone RU allocation |
| 148 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_52P26: 52+26-tone RU allocation |
| 149 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_106: 106-tone RU allocation |
| 150 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_106P26: 106+26 tone RU allocation |
| 151 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_242: 242-tone RU allocation |
| 152 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_484: 484-tone RU allocation |
| 153 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_484P242: 484+242 tone RU allocation |
| 154 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_996: 996-tone RU allocation |
| 155 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_996P484: 996+484 tone RU allocation |
| 156 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242: 996+484+242 tone RU allocation |
| 157 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_2x996: 2x996-tone RU allocation |
| 158 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484: 2x996+484 tone RU allocation |
| 159 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_3x996: 3x996-tone RU allocation |
| 160 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484: 3x996+484 tone RU allocation |
| 161 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC_4x996: 4x996-tone RU allocation |
| 162 | - */ |
| 163 | -enum nl80211_eht_ru_alloc { |
| 164 | - NL80211_RATE_INFO_EHT_RU_ALLOC_26, |
| 165 | - NL80211_RATE_INFO_EHT_RU_ALLOC_52, |
| 166 | - NL80211_RATE_INFO_EHT_RU_ALLOC_52P26, |
| 167 | - NL80211_RATE_INFO_EHT_RU_ALLOC_106, |
| 168 | - NL80211_RATE_INFO_EHT_RU_ALLOC_106P26, |
| 169 | - NL80211_RATE_INFO_EHT_RU_ALLOC_242, |
| 170 | - NL80211_RATE_INFO_EHT_RU_ALLOC_484, |
| 171 | - NL80211_RATE_INFO_EHT_RU_ALLOC_484P242, |
| 172 | - NL80211_RATE_INFO_EHT_RU_ALLOC_996, |
| 173 | - NL80211_RATE_INFO_EHT_RU_ALLOC_996P484, |
| 174 | - NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242, |
| 175 | - NL80211_RATE_INFO_EHT_RU_ALLOC_2x996, |
| 176 | - NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484, |
| 177 | - NL80211_RATE_INFO_EHT_RU_ALLOC_3x996, |
| 178 | - NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484, |
| 179 | - NL80211_RATE_INFO_EHT_RU_ALLOC_4x996, |
| 180 | -}; |
| 181 | - |
| 182 | -/** |
| 183 | * enum nl80211_rate_info - bitrate information |
| 184 | * |
| 185 | * These attribute types are used with %NL80211_STA_INFO_TXRATE |
| 186 | @@ -3491,13 +3390,6 @@ enum nl80211_eht_ru_alloc { |
| 187 | * @NL80211_RATE_INFO_HE_DCM: HE DCM value (u8, 0/1) |
| 188 | * @NL80211_RATE_INFO_RU_ALLOC: HE RU allocation, if not present then |
| 189 | * non-OFDMA was used (u8, see &enum nl80211_he_ru_alloc) |
| 190 | - * @NL80211_RATE_INFO_320_MHZ_WIDTH: 320 MHz bitrate |
| 191 | - * @NL80211_RATE_INFO_EHT_MCS: EHT MCS index (u8, 0-15) |
| 192 | - * @NL80211_RATE_INFO_EHT_NSS: EHT NSS value (u8, 1-8) |
| 193 | - * @NL80211_RATE_INFO_EHT_GI: EHT guard interval identifier |
| 194 | - * (u8, see &enum nl80211_eht_gi) |
| 195 | - * @NL80211_RATE_INFO_EHT_RU_ALLOC: EHT RU allocation, if not present then |
| 196 | - * non-OFDMA was used (u8, see &enum nl80211_eht_ru_alloc) |
| 197 | * @__NL80211_RATE_INFO_AFTER_LAST: internal use |
| 198 | */ |
| 199 | enum nl80211_rate_info { |
| 200 | @@ -3519,11 +3411,6 @@ enum nl80211_rate_info { |
| 201 | NL80211_RATE_INFO_HE_GI, |
| 202 | NL80211_RATE_INFO_HE_DCM, |
| 203 | NL80211_RATE_INFO_HE_RU_ALLOC, |
| 204 | - NL80211_RATE_INFO_320_MHZ_WIDTH, |
| 205 | - NL80211_RATE_INFO_EHT_MCS, |
| 206 | - NL80211_RATE_INFO_EHT_NSS, |
| 207 | - NL80211_RATE_INFO_EHT_GI, |
| 208 | - NL80211_RATE_INFO_EHT_RU_ALLOC, |
| 209 | |
| 210 | /* keep last */ |
| 211 | __NL80211_RATE_INFO_AFTER_LAST, |
| 212 | @@ -3834,20 +3721,13 @@ enum nl80211_mpath_info { |
| 213 | * capabilities IE |
| 214 | * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE: HE PPE thresholds information as |
| 215 | * defined in HE capabilities IE |
| 216 | + * @NL80211_BAND_IFTYPE_ATTR_MAX: highest band HE capability attribute currently |
| 217 | + * defined |
| 218 | * @NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA: HE 6GHz band capabilities (__le16), |
| 219 | * given for all 6 GHz band channels |
| 220 | * @NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS: vendor element capabilities that are |
| 221 | * advertised on this band/for this iftype (binary) |
| 222 | - * @NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC: EHT MAC capabilities as in EHT |
| 223 | - * capabilities element |
| 224 | - * @NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY: EHT PHY capabilities as in EHT |
| 225 | - * capabilities element |
| 226 | - * @NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET: EHT supported NSS/MCS as in EHT |
| 227 | - * capabilities element |
| 228 | - * @NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE: EHT PPE thresholds information as |
| 229 | - * defined in EHT capabilities element |
| 230 | * @__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST: internal use |
| 231 | - * @NL80211_BAND_IFTYPE_ATTR_MAX: highest band attribute currently defined |
| 232 | */ |
| 233 | enum nl80211_band_iftype_attr { |
| 234 | __NL80211_BAND_IFTYPE_ATTR_INVALID, |
| 235 | @@ -3859,10 +3739,6 @@ enum nl80211_band_iftype_attr { |
| 236 | NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE, |
| 237 | NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA, |
| 238 | NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS, |
| 239 | - NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC, |
| 240 | - NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY, |
| 241 | - NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET, |
| 242 | - NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE, |
| 243 | |
| 244 | /* keep last */ |
| 245 | __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST, |
| 246 | @@ -4007,10 +3883,6 @@ enum nl80211_wmm_rule { |
| 247 | * on this channel in current regulatory domain. |
| 248 | * @NL80211_FREQUENCY_ATTR_16MHZ: 16 MHz operation is allowed |
| 249 | * on this channel in current regulatory domain. |
| 250 | - * @NL80211_FREQUENCY_ATTR_NO_320MHZ: any 320 MHz channel using this channel |
| 251 | - * as the primary or any of the secondary channels isn't possible |
| 252 | - * @NL80211_FREQUENCY_ATTR_NO_EHT: EHT operation is not allowed on this channel |
| 253 | - * in current regulatory domain. |
| 254 | * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number |
| 255 | * currently defined |
| 256 | * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use |
| 257 | @@ -4047,8 +3919,6 @@ enum nl80211_frequency_attr { |
| 258 | NL80211_FREQUENCY_ATTR_4MHZ, |
| 259 | NL80211_FREQUENCY_ATTR_8MHZ, |
| 260 | NL80211_FREQUENCY_ATTR_16MHZ, |
| 261 | - NL80211_FREQUENCY_ATTR_NO_320MHZ, |
| 262 | - NL80211_FREQUENCY_ATTR_NO_EHT, |
| 263 | |
| 264 | /* keep last */ |
| 265 | __NL80211_FREQUENCY_ATTR_AFTER_LAST, |
| 266 | @@ -4247,7 +4117,6 @@ enum nl80211_sched_scan_match_attr { |
| 267 | * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed |
| 268 | * @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed |
| 269 | * @NL80211_RRF_NO_HE: HE operation not allowed |
| 270 | - * @NL80211_RRF_NO_320MHZ: 320MHz operation not allowed |
| 271 | */ |
| 272 | enum nl80211_reg_rule_flags { |
| 273 | NL80211_RRF_NO_OFDM = 1<<0, |
| 274 | @@ -4266,7 +4135,6 @@ enum nl80211_reg_rule_flags { |
| 275 | NL80211_RRF_NO_80MHZ = 1<<15, |
| 276 | NL80211_RRF_NO_160MHZ = 1<<16, |
| 277 | NL80211_RRF_NO_HE = 1<<17, |
| 278 | - NL80211_RRF_NO_320MHZ = 1<<18, |
| 279 | }; |
| 280 | |
| 281 | #define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR |
| 282 | @@ -4764,8 +4632,6 @@ enum nl80211_key_mode { |
| 283 | * @NL80211_CHAN_WIDTH_4: 4 MHz OFDM channel |
| 284 | * @NL80211_CHAN_WIDTH_8: 8 MHz OFDM channel |
| 285 | * @NL80211_CHAN_WIDTH_16: 16 MHz OFDM channel |
| 286 | - * @NL80211_CHAN_WIDTH_320: 320 MHz channel, the %NL80211_ATTR_CENTER_FREQ1 |
| 287 | - * attribute must be provided as well |
| 288 | */ |
| 289 | enum nl80211_chan_width { |
| 290 | NL80211_CHAN_WIDTH_20_NOHT, |
| 291 | @@ -4781,7 +4647,6 @@ enum nl80211_chan_width { |
| 292 | NL80211_CHAN_WIDTH_4, |
| 293 | NL80211_CHAN_WIDTH_8, |
| 294 | NL80211_CHAN_WIDTH_16, |
| 295 | - NL80211_CHAN_WIDTH_320, |
| 296 | }; |
| 297 | |
| 298 | /** |
| 299 | @@ -5096,7 +4961,6 @@ enum nl80211_txrate_gi { |
| 300 | * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 69.12 GHz) |
| 301 | * @NL80211_BAND_6GHZ: around 6 GHz band (5.9 - 7.2 GHz) |
| 302 | * @NL80211_BAND_S1GHZ: around 900MHz, supported by S1G PHYs |
| 303 | - * @NL80211_BAND_LC: light communication band (placeholder) |
| 304 | * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace |
| 305 | * since newer kernel versions may support more bands |
| 306 | */ |
| 307 | @@ -5106,7 +4970,6 @@ enum nl80211_band { |
| 308 | NL80211_BAND_60GHZ, |
| 309 | NL80211_BAND_6GHZ, |
| 310 | NL80211_BAND_S1GHZ, |
| 311 | - NL80211_BAND_LC, |
| 312 | |
| 313 | NUM_NL80211_BANDS, |
| 314 | }; |
| 315 | @@ -5673,7 +5536,7 @@ enum nl80211_iface_limit_attrs { |
| 316 | * => allows 8 of AP/GO that can have BI gcd >= min gcd |
| 317 | * |
| 318 | * numbers = [ #{STA} <= 2 ], channels = 2, max = 2 |
| 319 | - * => allows two STAs on the same or on different channels |
| 320 | + * => allows two STAs on different channels |
| 321 | * |
| 322 | * numbers = [ #{STA} <= 1, #{P2P-client,P2P-GO} <= 3 ], max = 4 |
| 323 | * => allows a STA plus three P2P interfaces |
| 324 | @@ -5718,7 +5581,7 @@ enum nl80211_if_combination_attrs { |
| 325 | * @NL80211_PLINK_ESTAB: mesh peer link is established |
| 326 | * @NL80211_PLINK_HOLDING: mesh peer link is being closed or cancelled |
| 327 | * @NL80211_PLINK_BLOCKED: all frames transmitted from this mesh |
| 328 | - * plink are discarded, except for authentication frames |
| 329 | + * plink are discarded |
| 330 | * @NUM_NL80211_PLINK_STATES: number of peer link states |
| 331 | * @MAX_NL80211_PLINK_STATES: highest numerical value of plink states |
| 332 | */ |
| 333 | @@ -5855,15 +5718,13 @@ enum nl80211_tdls_operation { |
| 334 | NL80211_TDLS_DISABLE_LINK, |
| 335 | }; |
| 336 | |
| 337 | -/** |
| 338 | +/* |
| 339 | * enum nl80211_ap_sme_features - device-integrated AP features |
| 340 | - * @NL80211_AP_SME_SA_QUERY_OFFLOAD: SA Query procedures offloaded to driver |
| 341 | - * when user space indicates support for SA Query procedures offload during |
| 342 | - * "start ap" with %NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT. |
| 343 | - */ |
| 344 | + * Reserved for future use, no bits are defined in |
| 345 | + * NL80211_ATTR_DEVICE_AP_SME yet. |
| 346 | enum nl80211_ap_sme_features { |
| 347 | - NL80211_AP_SME_SA_QUERY_OFFLOAD = 1 << 0, |
| 348 | }; |
| 349 | + */ |
| 350 | |
| 351 | /** |
| 352 | * enum nl80211_feature_flags - device/driver features |
| 353 | @@ -6166,11 +6027,6 @@ enum nl80211_feature_flags { |
| 354 | * @NL80211_EXT_FEATURE_BSS_COLOR: The driver supports BSS color collision |
| 355 | * detection and change announcemnts. |
| 356 | * |
| 357 | - * @NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD: Driver running in AP mode supports |
| 358 | - * FILS encryption and decryption for (Re)Association Request and Response |
| 359 | - * frames. Userspace has to share FILS AAD details to the driver by using |
| 360 | - * @NL80211_CMD_SET_FILS_AAD. |
| 361 | - * |
| 362 | * @NL80211_EXT_FEATURE_RADAR_BACKGROUND: Device supports background radar/CAC |
| 363 | * detection. |
| 364 | * |
| 365 | @@ -6239,7 +6095,6 @@ enum nl80211_ext_feature_index { |
| 366 | NL80211_EXT_FEATURE_SECURE_RTT, |
| 367 | NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE, |
| 368 | NL80211_EXT_FEATURE_BSS_COLOR, |
| 369 | - NL80211_EXT_FEATURE_FILS_CRYPTO_OFFLOAD, |
| 370 | NL80211_EXT_FEATURE_RADAR_BACKGROUND, |
| 371 | |
| 372 | /* add new features before the definition below */ |
| 373 | @@ -7548,7 +7403,7 @@ enum nl80211_sar_specs_attrs { |
| 374 | * @NL80211_MBSSID_CONFIG_ATTR_MAX_EMA_PROFILE_PERIODICITY: Used by the kernel |
| 375 | * to advertise the maximum profile periodicity supported by the driver |
| 376 | * if EMA is enabled. Driver should indicate EMA support to the userspace |
| 377 | - * by setting wiphy->ema_max_profile_periodicity to |
| 378 | + * by setting wiphy->mbssid_max_ema_profile_periodicity to |
| 379 | * a non-zero value. |
| 380 | * |
| 381 | * @NL80211_MBSSID_CONFIG_ATTR_INDEX: Mandatory parameter to pass the index of |
| 382 | @@ -7567,7 +7422,7 @@ enum nl80211_sar_specs_attrs { |
| 383 | * |
| 384 | * @NL80211_MBSSID_CONFIG_ATTR_EMA: Flag used to enable EMA AP feature. |
| 385 | * Setting this flag is permitted only if the driver advertises EMA support |
| 386 | - * by setting wiphy->ema_max_profile_periodicity to non-zero. |
| 387 | + * by setting wiphy->mbssid_max_ema_profile_periodicity to non-zero. |
| 388 | * |
| 389 | * @__NL80211_MBSSID_CONFIG_ATTR_LAST: Internal |
| 390 | * @NL80211_MBSSID_CONFIG_ATTR_MAX: highest attribute |
| 391 | @@ -7586,20 +7441,4 @@ enum nl80211_mbssid_config_attributes { |
| 392 | NL80211_MBSSID_CONFIG_ATTR_MAX = __NL80211_MBSSID_CONFIG_ATTR_LAST - 1, |
| 393 | }; |
| 394 | |
| 395 | -/** |
| 396 | - * enum nl80211_ap_settings_flags - AP settings flags |
| 397 | - * |
| 398 | - * @NL80211_AP_SETTINGS_EXTERNAL_AUTH_SUPPORT: AP supports external |
| 399 | - * authentication. |
| 400 | - * @NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT: Userspace supports SA Query |
| 401 | - * procedures offload to driver. If driver advertises |
| 402 | - * %NL80211_AP_SME_SA_QUERY_OFFLOAD in AP SME features, userspace shall |
| 403 | - * ignore SA Query procedures and validations when this flag is set by |
| 404 | - * userspace. |
| 405 | - */ |
| 406 | -enum nl80211_ap_settings_flags { |
| 407 | - NL80211_AP_SETTINGS_EXTERNAL_AUTH_SUPPORT = 1 << 0, |
| 408 | - NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT = 1 << 1, |
| 409 | -}; |
| 410 | - |
| 411 | #endif /* __LINUX_NL80211_H */ |
| 412 | --- a/event.c |
| 413 | +++ b/event.c |
| 414 | @@ -1292,9 +1292,6 @@ static int print_event(struct nl_msg *ms |
| 415 | case NL80211_CMD_CH_SWITCH_NOTIFY: |
| 416 | parse_ch_switch_notify(tb, gnlh->cmd); |
| 417 | break; |
| 418 | - case NL80211_CMD_ASSOC_COMEBACK: /* 147 */ |
| 419 | - parse_assoc_comeback(tb, gnlh->cmd); |
| 420 | - break; |
| 421 | default: |
| 422 | printf("unknown event %d (%s)\n", |
| 423 | gnlh->cmd, command_name(gnlh->cmd)); |
| 424 | --- a/info.c |
| 425 | +++ b/info.c |
| 426 | @@ -164,7 +164,6 @@ static void ext_feat_print(enum nl80211_ |
| 427 | ext_feat_case(PROT_RANGE_NEGO_AND_MEASURE, |
| 428 | "support for MFP in range measurement negotiation/procedure"); |
| 429 | ext_feat_case(BSS_COLOR, "BSS coloring support"); |
| 430 | - ext_feat_case(FILS_CRYPTO_OFFLOAD, "FILS crypto offload"); |
| 431 | ext_feat_case(RADAR_BACKGROUND, "Radar background support"); |
| 432 | } |
| 433 | } |
| 434 | --- a/interface.c |
| 435 | +++ b/interface.c |
| 436 | @@ -362,8 +362,6 @@ char *channel_width_name(enum nl80211_ch |
| 437 | return "5 MHz"; |
| 438 | case NL80211_CHAN_WIDTH_10: |
| 439 | return "10 MHz"; |
| 440 | - case NL80211_CHAN_WIDTH_320: |
| 441 | - return "320 MHz"; |
| 442 | default: |
| 443 | return "unknown"; |
| 444 | } |
| 445 | --- a/util.c |
| 446 | +++ b/util.c |
| 447 | @@ -508,7 +508,6 @@ static int parse_freqs(struct chandef *c |
| 448 | case NL80211_CHAN_WIDTH_40: |
| 449 | case NL80211_CHAN_WIDTH_80: |
| 450 | case NL80211_CHAN_WIDTH_160: |
| 451 | - case NL80211_CHAN_WIDTH_320: |
| 452 | need_cf1 = true; |
| 453 | break; |
| 454 | case NL80211_CHAN_WIDTH_1: |
| 455 | @@ -626,10 +625,6 @@ int parse_freqchan(struct chandef *chand |
| 456 | .width = NL80211_CHAN_WIDTH_160, |
| 457 | .freq1_diff = 0, |
| 458 | .chantype = -1 }, |
| 459 | - { .name = "320MHz", |
| 460 | - .width = NL80211_CHAN_WIDTH_320, |
| 461 | - .freq1_diff = 0, |
| 462 | - .chantype = -1 }, |
| 463 | }; |
| 464 | const struct chanmode *chanmode_selected = NULL; |
| 465 | unsigned int freq; |
| 466 | @@ -1599,48 +1594,6 @@ void print_eht_info(struct nlattr *nl_if |
| 467 | print_iftype_line(tb[NL80211_BAND_IFTYPE_ATTR_IFTYPES]); |
| 468 | printf("\n"); |
| 469 | |
| 470 | - if (tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC]) { |
| 471 | - len = nla_len(tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC]); |
| 472 | - if (len > sizeof(mac_cap)) |
| 473 | - len = sizeof(mac_cap); |
| 474 | - memcpy(mac_cap, |
| 475 | - nla_data(tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC]), |
| 476 | - len); |
| 477 | - } |
| 478 | - |
| 479 | - if (tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY]) { |
| 480 | - len = nla_len(tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY]); |
| 481 | - |
| 482 | - if (len > sizeof(phy_cap)) |
| 483 | - len = sizeof(phy_cap); |
| 484 | - |
| 485 | - memcpy(phy_cap, |
| 486 | - nla_data(tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY]), |
| 487 | - len); |
| 488 | - } |
| 489 | - |
| 490 | - if (tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET]) { |
| 491 | - len = nla_len(tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET]); |
| 492 | - if (len > sizeof(mcs_set)) |
| 493 | - len = sizeof(mcs_set); |
| 494 | - memcpy(mcs_set, |
| 495 | - nla_data(tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET]), |
| 496 | - len); |
| 497 | - |
| 498 | - // Assume that all parts of the MCS set are present |
| 499 | - mcs_len = sizeof(mcs_set); |
| 500 | - } |
| 501 | - |
| 502 | - if (tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE]) { |
| 503 | - len = nla_len(tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE]); |
| 504 | - if (len > sizeof(ppet)) |
| 505 | - len = sizeof(ppet); |
| 506 | - memcpy(ppet, |
| 507 | - nla_data(tb[NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE]), |
| 508 | - len); |
| 509 | - ppet_len = len; |
| 510 | - } |
| 511 | - |
| 512 | if (tb[NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY]) { |
| 513 | len = nla_len(tb[NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY]); |
| 514 | |
| 515 | --- a/reg.c |
| 516 | +++ b/reg.c |
| 517 | @@ -210,7 +210,6 @@ static int print_reg_handler(struct nl_m |
| 518 | PARSE_FLAG(NL80211_RRF_NO_80MHZ, "NO-80MHZ"); |
| 519 | PARSE_FLAG(NL80211_RRF_NO_160MHZ, "NO-160MHZ"); |
| 520 | PARSE_FLAG(NL80211_RRF_NO_HE, "NO-HE"); |
| 521 | - PARSE_FLAG(NL80211_RRF_NO_320MHZ, "NO-320MHZ"); |
| 522 | |
| 523 | /* Kernels that support NO_IR always turn on both flags */ |
| 524 | if ((flags & NL80211_RRF_NO_IR) && (flags & __NL80211_RRF_NO_IBSS)) { |
| 525 | --- a/station.c |
| 526 | +++ b/station.c |
| 527 | @@ -239,8 +239,6 @@ void parse_bitrate(struct nlattr *bitrat |
| 528 | pos += snprintf(pos, buflen - (pos - buf), " 80P80MHz"); |
| 529 | if (rinfo[NL80211_RATE_INFO_160_MHZ_WIDTH]) |
| 530 | pos += snprintf(pos, buflen - (pos - buf), " 160MHz"); |
| 531 | - if (rinfo[NL80211_RATE_INFO_320_MHZ_WIDTH]) |
| 532 | - pos += snprintf(pos, buflen - (pos - buf), " 320MHz"); |
| 533 | if (rinfo[NL80211_RATE_INFO_SHORT_GI]) |
| 534 | pos += snprintf(pos, buflen - (pos - buf), " short GI"); |
| 535 | if (rinfo[NL80211_RATE_INFO_VHT_NSS]) |
| 536 | @@ -261,18 +259,6 @@ void parse_bitrate(struct nlattr *bitrat |
| 537 | if (rinfo[NL80211_RATE_INFO_HE_RU_ALLOC]) |
| 538 | pos += snprintf(pos, buflen - (pos - buf), |
| 539 | " HE-RU-ALLOC %d", nla_get_u8(rinfo[NL80211_RATE_INFO_HE_RU_ALLOC])); |
| 540 | - if (rinfo[NL80211_RATE_INFO_EHT_MCS]) |
| 541 | - pos += snprintf(pos, buflen - (pos - buf), |
| 542 | - " EHT-MCS %d", nla_get_u8(rinfo[NL80211_RATE_INFO_EHT_MCS])); |
| 543 | - if (rinfo[NL80211_RATE_INFO_EHT_NSS]) |
| 544 | - pos += snprintf(pos, buflen - (pos - buf), |
| 545 | - " EHT-NSS %d", nla_get_u8(rinfo[NL80211_RATE_INFO_EHT_NSS])); |
| 546 | - if (rinfo[NL80211_RATE_INFO_EHT_GI]) |
| 547 | - pos += snprintf(pos, buflen - (pos - buf), |
| 548 | - " EHT-GI %d", nla_get_u8(rinfo[NL80211_RATE_INFO_EHT_GI])); |
| 549 | - if (rinfo[NL80211_RATE_INFO_EHT_RU_ALLOC]) |
| 550 | - pos += snprintf(pos, buflen - (pos - buf), |
| 551 | - " EHT-RU-ALLOC %d", nla_get_u8(rinfo[NL80211_RATE_INFO_EHT_RU_ALLOC])); |
| 552 | } |
| 553 | |
| 554 | static char *get_chain_signal(struct nlattr *attr_list) |