From cb60bee04db6cdfe5062c20b816244ab49f2e9d1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau <nbd@nbd.name> Date: Wed, 2 Oct 2024 19:56:52 +0200 Subject: [PATCH] iwinfo: add multi-radio support Fix the path to the hostapd config file for queries Signed-off-by: Felix Fietkau <nbd@nbd.name> --- .../iwinfo/patches/100-multi_radio.patch | 1498 +++++++++++++++++ 1 file changed, 1498 insertions(+) create mode 100644 package/network/utils/iwinfo/patches/100-multi_radio.patch diff --git a/package/network/utils/iwinfo/patches/100-multi_radio.patch b/package/network/utils/iwinfo/patches/100-multi_radio.patch new file mode 100644 index 0000000000..3ad3b4fd10 --- /dev/null +++ b/package/network/utils/iwinfo/patches/100-multi_radio.patch @@ -0,0 +1,1498 @@ +--- a/api/nl80211.h ++++ b/api/nl80211.h +@@ -11,7 +11,7 @@ + * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com> + * Copyright 2008 Colin McCabe <colin@cozybit.com> + * Copyright 2015-2017 Intel Deutschland GmbH +- * Copyright (C) 2018-2023 Intel Corporation ++ * Copyright (C) 2018-2024 Intel Corporation + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above +@@ -72,7 +72,7 @@ + * For drivers supporting TDLS with external setup (WIPHY_FLAG_SUPPORTS_TDLS + * and WIPHY_FLAG_TDLS_EXTERNAL_SETUP), the station lifetime is as follows: + * - a setup station entry is added, not yet authorized, without any rate +- * or capability information, this just exists to avoid race conditions ++ * or capability information; this just exists to avoid race conditions + * - when the TDLS setup is done, a single NL80211_CMD_SET_STATION is valid + * to add rate and capability information to the station and at the same + * time mark it authorized. +@@ -87,7 +87,7 @@ + * DOC: Frame transmission/registration support + * + * Frame transmission and registration support exists to allow userspace +- * management entities such as wpa_supplicant react to management frames ++ * management entities such as wpa_supplicant to react to management frames + * that are not being handled by the kernel. This includes, for example, + * certain classes of action frames that cannot be handled in the kernel + * for various reasons. +@@ -113,7 +113,7 @@ + * + * Frame transmission allows userspace to send for example the required + * responses to action frames. It is subject to some sanity checking, +- * but many frames can be transmitted. When a frame was transmitted, its ++ * but many frames can be transmitted. When a frame is transmitted, its + * status is indicated to the sending socket. + * + * For more technical details, see the corresponding command descriptions +@@ -123,7 +123,7 @@ + /** + * DOC: Virtual interface / concurrency capabilities + * +- * Some devices are able to operate with virtual MACs, they can have ++ * Some devices are able to operate with virtual MACs; they can have + * more than one virtual interface. The capability handling for this + * is a bit complex though, as there may be a number of restrictions + * on the types of concurrency that are supported. +@@ -135,7 +135,7 @@ + * Once concurrency is desired, more attributes must be observed: + * To start with, since some interface types are purely managed in + * software, like the AP-VLAN type in mac80211 for example, there's +- * an additional list of these, they can be added at any time and ++ * an additional list of these; they can be added at any time and + * are only restricted by some semantic restrictions (e.g. AP-VLAN + * cannot be added without a corresponding AP interface). This list + * is exported in the %NL80211_ATTR_SOFTWARE_IFTYPES attribute. +@@ -164,17 +164,17 @@ + * Packet coalesce feature helps to reduce number of received interrupts + * to host by buffering these packets in firmware/hardware for some + * predefined time. Received interrupt will be generated when one of the +- * following events occur. ++ * following events occurs. + * a) Expiration of hardware timer whose expiration time is set to maximum + * coalescing delay of matching coalesce rule. +- * b) Coalescing buffer in hardware reaches it's limit. ++ * b) Coalescing buffer in hardware reaches its limit. + * c) Packet doesn't match any of the configured coalesce rules. + * + * User needs to configure following parameters for creating a coalesce + * rule. + * a) Maximum coalescing delay + * b) List of packet patterns which needs to be matched +- * c) Condition for coalescence. pattern 'match' or 'no match' ++ * c) Condition for coalescence: pattern 'match' or 'no match' + * Multiple such rules can be created. + */ + +@@ -213,7 +213,7 @@ + /** + * DOC: FILS shared key authentication offload + * +- * FILS shared key authentication offload can be advertized by drivers by ++ * FILS shared key authentication offload can be advertised by drivers by + * setting @NL80211_EXT_FEATURE_FILS_SK_OFFLOAD flag. The drivers that support + * FILS shared key authentication offload should be able to construct the + * authentication and association frames for FILS shared key authentication and +@@ -239,7 +239,7 @@ + * The PMKSA can be maintained in userspace persistently so that it can be used + * later after reboots or wifi turn off/on also. + * +- * %NL80211_ATTR_FILS_CACHE_ID is the cache identifier advertized by a FILS ++ * %NL80211_ATTR_FILS_CACHE_ID is the cache identifier advertised by a FILS + * capable AP supporting PMK caching. It specifies the scope within which the + * PMKSAs are cached in an ESS. %NL80211_CMD_SET_PMKSA and + * %NL80211_CMD_DEL_PMKSA are enhanced to allow support for PMKSA caching based +@@ -290,12 +290,12 @@ + * If the configuration needs to be applied for specific peer then the MAC + * address of the peer needs to be passed in %NL80211_ATTR_MAC, otherwise the + * configuration will be applied for all the connected peers in the vif except +- * any peers that have peer specific configuration for the TID by default; if +- * the %NL80211_TID_CONFIG_ATTR_OVERRIDE flag is set, peer specific values ++ * any peers that have peer-specific configuration for the TID by default; if ++ * the %NL80211_TID_CONFIG_ATTR_OVERRIDE flag is set, peer-specific values + * will be overwritten. + * +- * All this configuration is valid only for STA's current connection +- * i.e. the configuration will be reset to default when the STA connects back ++ * All this configuration is valid only for STA's current connection, ++ * i.e., the configuration will be reset to default when the STA connects back + * after disconnection/roaming, and this configuration will be cleared when + * the interface goes down. + */ +@@ -326,7 +326,7 @@ + /** + * DOC: Multi-Link Operation + * +- * In Multi-Link Operation, a connection between to MLDs utilizes multiple ++ * In Multi-Link Operation, a connection between two MLDs utilizes multiple + * links. To use this in nl80211, various commands and responses now need + * to or will include the new %NL80211_ATTR_MLO_LINKS attribute. + * Additionally, various commands that need to operate on a specific link +@@ -335,6 +335,15 @@ + */ + + /** ++ * DOC: OWE DH IE handling offload ++ * ++ * By setting @NL80211_EXT_FEATURE_OWE_OFFLOAD flag, drivers can indicate ++ * kernel/application space to avoid DH IE handling. When this flag is ++ * advertised, the driver/device will take care of DH IE inclusion and ++ * processing of peer DH IE to generate PMK. ++ */ ++ ++/** + * enum nl80211_commands - supported nl80211 commands + * + * @NL80211_CMD_UNSPEC: unspecified command to catch errors +@@ -404,8 +413,8 @@ + * are like for %NL80211_CMD_SET_BEACON, and additionally parameters that + * do not change are used, these include %NL80211_ATTR_BEACON_INTERVAL, + * %NL80211_ATTR_DTIM_PERIOD, %NL80211_ATTR_SSID, +- * %NL80211_ATTR_HIDDEN_SSID, %NL80211_ATTR_CIPHERS_PAIRWISE, +- * %NL80211_ATTR_CIPHER_GROUP, %NL80211_ATTR_WPA_VERSIONS, ++ * %NL80211_ATTR_HIDDEN_SSID, %NL80211_ATTR_CIPHER_SUITES_PAIRWISE, ++ * %NL80211_ATTR_CIPHER_SUITE_GROUP, %NL80211_ATTR_WPA_VERSIONS, + * %NL80211_ATTR_AKM_SUITES, %NL80211_ATTR_PRIVACY, + * %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_INACTIVITY_TIMEOUT, + * %NL80211_ATTR_ACL_POLICY and %NL80211_ATTR_MAC_ADDRS. +@@ -429,23 +438,19 @@ + * %NL80211_ATTR_REASON_CODE can optionally be used to specify which type + * of disconnection indication should be sent to the station + * (Deauthentication or Disassociation frame and reason code for that +- * frame). ++ * frame). %NL80211_ATTR_MLO_LINK_ID can be used optionally to remove ++ * stations connected and using at least that link as one of its links. + * + * @NL80211_CMD_GET_MPATH: Get mesh path attributes for mesh path to +- * destination %NL80211_ATTR_MAC on the interface identified by +- * %NL80211_ATTR_IFINDEX. ++ * destination %NL80211_ATTR_MAC on the interface identified by ++ * %NL80211_ATTR_IFINDEX. + * @NL80211_CMD_SET_MPATH: Set mesh path attributes for mesh path to +- * destination %NL80211_ATTR_MAC on the interface identified by +- * %NL80211_ATTR_IFINDEX. ++ * destination %NL80211_ATTR_MAC on the interface identified by ++ * %NL80211_ATTR_IFINDEX. + * @NL80211_CMD_NEW_MPATH: Create a new mesh path for the destination given by + * %NL80211_ATTR_MAC via %NL80211_ATTR_MPATH_NEXT_HOP. + * @NL80211_CMD_DEL_MPATH: Delete a mesh path to the destination given by + * %NL80211_ATTR_MAC. +- * @NL80211_CMD_NEW_PATH: Add a mesh path with given attributes to the +- * interface identified by %NL80211_ATTR_IFINDEX. +- * @NL80211_CMD_DEL_PATH: Remove a mesh path identified by %NL80211_ATTR_MAC +- * or, if no MAC address given, all mesh paths, on the interface identified +- * by %NL80211_ATTR_IFINDEX. + * @NL80211_CMD_SET_BSS: Set BSS attributes for BSS identified by + * %NL80211_ATTR_IFINDEX. + * +@@ -466,15 +471,15 @@ + * after being queried by the kernel. CRDA replies by sending a regulatory + * domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our + * current alpha2 if it found a match. It also provides +- * NL80211_ATTR_REG_RULE_FLAGS, and a set of regulatory rules. Each +- * regulatory rule is a nested set of attributes given by +- * %NL80211_ATTR_REG_RULE_FREQ_[START|END] and +- * %NL80211_ATTR_FREQ_RANGE_MAX_BW with an attached power rule given by +- * %NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and +- * %NL80211_ATTR_REG_RULE_POWER_MAX_EIRP. ++ * NL80211_ATTR_REG_RULE_FLAGS, and a set of regulatory rules. Each ++ * regulatory rule is a nested set of attributes given by ++ * %NL80211_ATTR_REG_RULE_FREQ_[START|END] and ++ * %NL80211_ATTR_FREQ_RANGE_MAX_BW with an attached power rule given by ++ * %NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and ++ * %NL80211_ATTR_REG_RULE_POWER_MAX_EIRP. + * @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain +- * to the specified ISO/IEC 3166-1 alpha2 country code. The core will +- * store this as a valid request and then query userspace for it. ++ * to the specified ISO/IEC 3166-1 alpha2 country code. The core will ++ * store this as a valid request and then query userspace for it. + * + * @NL80211_CMD_GET_MESH_CONFIG: Get mesh networking properties for the + * interface identified by %NL80211_ATTR_IFINDEX +@@ -512,7 +517,7 @@ + * %NL80211_ATTR_SCHED_SCAN_PLANS. If %NL80211_ATTR_SCHED_SCAN_PLANS is + * not specified and only %NL80211_ATTR_SCHED_SCAN_INTERVAL is specified, + * scheduled scan will run in an infinite loop with the specified interval. +- * These attributes are mutually exculsive, ++ * These attributes are mutually exclusive, + * i.e. NL80211_ATTR_SCHED_SCAN_INTERVAL must not be passed if + * NL80211_ATTR_SCHED_SCAN_PLANS is defined. + * If for some reason scheduled scan is aborted by the driver, all scan +@@ -543,7 +548,7 @@ + * %NL80211_CMD_STOP_SCHED_SCAN command is received or when the interface + * is brought down while a scheduled scan was running. + * +- * @NL80211_CMD_GET_SURVEY: get survey resuls, e.g. channel occupation ++ * @NL80211_CMD_GET_SURVEY: get survey results, e.g. channel occupation + * or noise level + * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to + * NL80211_CMD_GET_SURVEY and on the "scan" multicast group) +@@ -554,40 +559,41 @@ + * using %NL80211_ATTR_SSID, %NL80211_ATTR_FILS_CACHE_ID, + * %NL80211_ATTR_PMKID, and %NL80211_ATTR_PMK in case of FILS + * authentication where %NL80211_ATTR_FILS_CACHE_ID is the identifier +- * advertized by a FILS capable AP identifying the scope of PMKSA in an ++ * advertised by a FILS capable AP identifying the scope of PMKSA in an + * ESS. + * @NL80211_CMD_DEL_PMKSA: Delete a PMKSA cache entry, using %NL80211_ATTR_MAC + * (for the BSSID) and %NL80211_ATTR_PMKID or using %NL80211_ATTR_SSID, + * %NL80211_ATTR_FILS_CACHE_ID, and %NL80211_ATTR_PMKID in case of FILS +- * authentication. ++ * authentication. Additionally in case of SAE offload and OWE offloads ++ * PMKSA entry can be deleted using %NL80211_ATTR_SSID. + * @NL80211_CMD_FLUSH_PMKSA: Flush all PMKSA cache entries. + * + * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain +- * has been changed and provides details of the request information +- * that caused the change such as who initiated the regulatory request +- * (%NL80211_ATTR_REG_INITIATOR), the wiphy_idx +- * (%NL80211_ATTR_REG_ALPHA2) on which the request was made from if +- * the initiator was %NL80211_REGDOM_SET_BY_COUNTRY_IE or +- * %NL80211_REGDOM_SET_BY_DRIVER, the type of regulatory domain +- * set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is +- * %NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on +- * to (%NL80211_ATTR_REG_ALPHA2). ++ * has been changed and provides details of the request information ++ * that caused the change such as who initiated the regulatory request ++ * (%NL80211_ATTR_REG_INITIATOR), the wiphy_idx ++ * (%NL80211_ATTR_REG_ALPHA2) on which the request was made from if ++ * the initiator was %NL80211_REGDOM_SET_BY_COUNTRY_IE or ++ * %NL80211_REGDOM_SET_BY_DRIVER, the type of regulatory domain ++ * set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is ++ * %NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on ++ * to (%NL80211_ATTR_REG_ALPHA2). + * @NL80211_CMD_REG_BEACON_HINT: indicates to userspace that an AP beacon +- * has been found while world roaming thus enabling active scan or +- * any mode of operation that initiates TX (beacons) on a channel +- * where we would not have been able to do either before. As an example +- * if you are world roaming (regulatory domain set to world or if your +- * driver is using a custom world roaming regulatory domain) and while +- * doing a passive scan on the 5 GHz band you find an AP there (if not +- * on a DFS channel) you will now be able to actively scan for that AP +- * or use AP mode on your card on that same channel. Note that this will +- * never be used for channels 1-11 on the 2 GHz band as they are always +- * enabled world wide. This beacon hint is only sent if your device had +- * either disabled active scanning or beaconing on a channel. We send to +- * userspace the wiphy on which we removed a restriction from +- * (%NL80211_ATTR_WIPHY) and the channel on which this occurred +- * before (%NL80211_ATTR_FREQ_BEFORE) and after (%NL80211_ATTR_FREQ_AFTER) +- * the beacon hint was processed. ++ * has been found while world roaming thus enabling active scan or ++ * any mode of operation that initiates TX (beacons) on a channel ++ * where we would not have been able to do either before. As an example ++ * if you are world roaming (regulatory domain set to world or if your ++ * driver is using a custom world roaming regulatory domain) and while ++ * doing a passive scan on the 5 GHz band you find an AP there (if not ++ * on a DFS channel) you will now be able to actively scan for that AP ++ * or use AP mode on your card on that same channel. Note that this will ++ * never be used for channels 1-11 on the 2 GHz band as they are always ++ * enabled world wide. This beacon hint is only sent if your device had ++ * either disabled active scanning or beaconing on a channel. We send to ++ * userspace the wiphy on which we removed a restriction from ++ * (%NL80211_ATTR_WIPHY) and the channel on which this occurred ++ * before (%NL80211_ATTR_FREQ_BEFORE) and after (%NL80211_ATTR_FREQ_AFTER) ++ * the beacon hint was processed. + * + * @NL80211_CMD_AUTHENTICATE: authentication request and notification. + * This command is used both as a command (request to authenticate) and +@@ -598,7 +604,7 @@ + * BSSID in case of station mode). %NL80211_ATTR_SSID is used to specify + * the SSID (mainly for association, but is included in authentication + * request, too, to help BSS selection. %NL80211_ATTR_WIPHY_FREQ + +- * %NL80211_ATTR_WIPHY_FREQ_OFFSET is used to specify the frequence of the ++ * %NL80211_ATTR_WIPHY_FREQ_OFFSET is used to specify the frequency of the + * channel in MHz. %NL80211_ATTR_AUTH_TYPE is used to specify the + * authentication type. %NL80211_ATTR_IE is used to define IEs + * (VendorSpecificInfo, but also including RSN IE and FT IEs) to be added +@@ -807,7 +813,7 @@ + * reached. + * @NL80211_CMD_SET_CHANNEL: Set the channel (using %NL80211_ATTR_WIPHY_FREQ + * and the attributes determining channel width) the given interface +- * (identifed by %NL80211_ATTR_IFINDEX) shall operate on. ++ * (identified by %NL80211_ATTR_IFINDEX) shall operate on. + * In case multiple channels are supported by the device, the mechanism + * with which it switches channels is implementation-defined. + * When a monitor interface is given, it can only switch channel while +@@ -879,7 +885,7 @@ + * inform userspace of the new replay counter. + * + * @NL80211_CMD_PMKSA_CANDIDATE: This is used as an event to inform userspace +- * of PMKSA caching dandidates. ++ * of PMKSA caching candidates. + * + * @NL80211_CMD_TDLS_OPER: Perform a high-level TDLS command (e.g. link setup). + * In addition, this can be used as an event to request userspace to take +@@ -915,7 +921,7 @@ + * + * @NL80211_CMD_PROBE_CLIENT: Probe an associated station on an AP interface + * by sending a null data frame to it and reporting when the frame is +- * acknowleged. This is used to allow timing out inactive clients. Uses ++ * acknowledged. This is used to allow timing out inactive clients. Uses + * %NL80211_ATTR_IFINDEX and %NL80211_ATTR_MAC. The command returns a + * direct reply with an %NL80211_ATTR_COOKIE that is later used to match + * up the event with the request. The event includes the same data and +@@ -1109,7 +1115,7 @@ + * current configuration is not changed. If it is present but + * set to zero, the configuration is changed to don't-care + * (i.e. the device can decide what to do). +- * @NL80211_CMD_NAN_FUNC_MATCH: Notification sent when a match is reported. ++ * @NL80211_CMD_NAN_MATCH: Notification sent when a match is reported. + * This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and + * %NL80211_ATTR_COOKIE. + * +@@ -1126,11 +1132,15 @@ + * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously + * configured PMK for the authenticator address identified by + * %NL80211_ATTR_MAC. +- * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates an 802.1X FT roam was +- * completed successfully. Drivers that support 4 way handshake offload +- * should send this event after indicating 802.1X FT assocation with +- * %NL80211_CMD_ROAM. If the 4 way handshake failed %NL80211_CMD_DISCONNECT +- * should be indicated instead. ++ * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates port is authorized and ++ * open for regular data traffic. For STA/P2P-client, this event is sent ++ * with AP MAC address and for AP/P2P-GO, the event carries the STA/P2P- ++ * client MAC address. ++ * Drivers that support 4 way handshake offload should send this event for ++ * STA/P2P-client after successful 4-way HS or after 802.1X FT following ++ * NL80211_CMD_CONNECT or NL80211_CMD_ROAM. Drivers using AP/P2P-GO 4-way ++ * handshake offload should send this event on successful completion of ++ * 4-way handshake with the peer (STA/P2P-client). + * @NL80211_CMD_CONTROL_PORT_FRAME: Control Port (e.g. PAE) frame TX request + * and RX notification. This command is used both as a request to transmit + * a control port frame and as a notification that a control port frame +@@ -1314,6 +1324,11 @@ + * Multi-Link reconfiguration. %NL80211_ATTR_MLO_LINKS is used to provide + * information about the removed STA MLD setup links. + * ++ * @NL80211_CMD_SET_TID_TO_LINK_MAPPING: Set the TID to Link Mapping for a ++ * non-AP MLD station. The %NL80211_ATTR_MLO_TTLM_DLINK and ++ * %NL80211_ATTR_MLO_TTLM_ULINK attributes are used to specify the ++ * TID to Link mapping for downlink/uplink traffic. ++ * + * @NL80211_CMD_MAX: highest used command number + * @__NL80211_CMD_AFTER_LAST: internal use + */ +@@ -1569,6 +1584,8 @@ enum nl80211_commands { + + NL80211_CMD_LINKS_REMOVED, + ++ NL80211_CMD_SET_TID_TO_LINK_MAPPING, ++ + /* add new commands above here */ + + /* used to define NL80211_CMD_MAX below */ +@@ -1693,21 +1710,21 @@ enum nl80211_commands { + * (see &enum nl80211_plink_action). + * @NL80211_ATTR_MPATH_NEXT_HOP: MAC address of the next hop for a mesh path. + * @NL80211_ATTR_MPATH_INFO: information about a mesh_path, part of mesh path +- * info given for %NL80211_CMD_GET_MPATH, nested attribute described at ++ * info given for %NL80211_CMD_GET_MPATH, nested attribute described at + * &enum nl80211_mpath_info. + * + * @NL80211_ATTR_MNTR_FLAGS: flags, nested element with NLA_FLAG attributes of + * &enum nl80211_mntr_flags. + * + * @NL80211_ATTR_REG_ALPHA2: an ISO-3166-alpha2 country code for which the +- * current regulatory domain should be set to or is already set to. +- * For example, 'CR', for Costa Rica. This attribute is used by the kernel +- * to query the CRDA to retrieve one regulatory domain. This attribute can +- * also be used by userspace to query the kernel for the currently set +- * regulatory domain. We chose an alpha2 as that is also used by the +- * IEEE-802.11 country information element to identify a country. +- * Users can also simply ask the wireless core to set regulatory domain +- * to a specific alpha2. ++ * current regulatory domain should be set to or is already set to. ++ * For example, 'CR', for Costa Rica. This attribute is used by the kernel ++ * to query the CRDA to retrieve one regulatory domain. This attribute can ++ * also be used by userspace to query the kernel for the currently set ++ * regulatory domain. We chose an alpha2 as that is also used by the ++ * IEEE-802.11 country information element to identify a country. ++ * Users can also simply ask the wireless core to set regulatory domain ++ * to a specific alpha2. + * @NL80211_ATTR_REG_RULES: a nested array of regulatory domain regulatory + * rules. + * +@@ -1750,9 +1767,9 @@ enum nl80211_commands { + * @NL80211_ATTR_BSS: scan result BSS + * + * @NL80211_ATTR_REG_INITIATOR: indicates who requested the regulatory domain +- * currently in effect. This could be any of the %NL80211_REGDOM_SET_BY_* ++ * currently in effect. This could be any of the %NL80211_REGDOM_SET_BY_* + * @NL80211_ATTR_REG_TYPE: indicates the type of the regulatory domain currently +- * set. This can be one of the nl80211_reg_type (%NL80211_REGDOM_TYPE_*) ++ * set. This can be one of the nl80211_reg_type (%NL80211_REGDOM_TYPE_*) + * + * @NL80211_ATTR_SUPPORTED_COMMANDS: wiphy attribute that specifies + * an array of command numbers (i.e. a mapping index to command number) +@@ -1771,15 +1788,15 @@ enum nl80211_commands { + * a u32 + * + * @NL80211_ATTR_FREQ_BEFORE: A channel which has suffered a regulatory change +- * due to considerations from a beacon hint. This attribute reflects +- * the state of the channel _before_ the beacon hint processing. This +- * attributes consists of a nested attribute containing +- * NL80211_FREQUENCY_ATTR_* ++ * due to considerations from a beacon hint. This attribute reflects ++ * the state of the channel _before_ the beacon hint processing. This ++ * attributes consists of a nested attribute containing ++ * NL80211_FREQUENCY_ATTR_* + * @NL80211_ATTR_FREQ_AFTER: A channel which has suffered a regulatory change +- * due to considerations from a beacon hint. This attribute reflects +- * the state of the channel _after_ the beacon hint processing. This +- * attributes consists of a nested attribute containing +- * NL80211_FREQUENCY_ATTR_* ++ * due to considerations from a beacon hint. This attribute reflects ++ * the state of the channel _after_ the beacon hint processing. This ++ * attributes consists of a nested attribute containing ++ * NL80211_FREQUENCY_ATTR_* + * + * @NL80211_ATTR_CIPHER_SUITES: a set of u32 values indicating the supported + * cipher suites +@@ -1826,7 +1843,7 @@ enum nl80211_commands { + * using %CMD_CONTROL_PORT_FRAME. If control port routing over NL80211 is + * to be used then userspace must also use the %NL80211_ATTR_SOCKET_OWNER + * flag. When used with %NL80211_ATTR_CONTROL_PORT_NO_PREAUTH, pre-auth +- * frames are not forwared over the control port. ++ * frames are not forwarded over the control port. + * + * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver. + * We recommend using nested, driver-specific attributes within this. +@@ -1840,12 +1857,6 @@ enum nl80211_commands { + * that protected APs should be used. This is also used with NEW_BEACON to + * indicate that the BSS is to use protection. + * +- * @NL80211_ATTR_CIPHERS_PAIRWISE: Used with CONNECT, ASSOCIATE, and NEW_BEACON +- * to indicate which unicast key ciphers will be used with the connection +- * (an array of u32). +- * @NL80211_ATTR_CIPHER_GROUP: Used with CONNECT, ASSOCIATE, and NEW_BEACON to +- * indicate which group key cipher will be used with the connection (a +- * u32). + * @NL80211_ATTR_WPA_VERSIONS: Used with CONNECT, ASSOCIATE, and NEW_BEACON to + * indicate which WPA version(s) the AP we want to associate with is using + * (a u32 with flags from &enum nl80211_wpa_versions). +@@ -1876,6 +1887,7 @@ enum nl80211_commands { + * with %NL80211_KEY_* sub-attributes + * + * @NL80211_ATTR_PID: Process ID of a network namespace. ++ * @NL80211_ATTR_NETNS_FD: File descriptor of a network namespace. + * + * @NL80211_ATTR_GENERATION: Used to indicate consistent snapshots for + * dumps. This number increases whenever the object list being +@@ -1930,6 +1942,7 @@ enum nl80211_commands { + * + * @NL80211_ATTR_ACK: Flag attribute indicating that the frame was + * acknowledged by the recipient. ++ * @NL80211_ATTR_ACK_SIGNAL: Station's ack signal strength (s32) + * + * @NL80211_ATTR_PS_STATE: powersave state, using &enum nl80211_ps_state values. + * +@@ -1963,10 +1976,10 @@ enum nl80211_commands { + * bit. Depending on which antennas are selected in the bitmap, 802.11n + * drivers can derive which chainmasks to use (if all antennas belonging to + * a particular chain are disabled this chain should be disabled) and if +- * a chain has diversity antennas wether diversity should be used or not. ++ * a chain has diversity antennas whether diversity should be used or not. + * HT capabilities (STBC, TX Beamforming, Antenna selection) can be + * derived from the available chains after applying the antenna mask. +- * Non-802.11n drivers can derive wether to use diversity or not. ++ * Non-802.11n drivers can derive whether to use diversity or not. + * Drivers may reject configurations or RX/TX mask combinations they cannot + * support by returning -EINVAL. + * +@@ -2039,6 +2052,10 @@ enum nl80211_commands { + * @NL80211_ATTR_INTERFACE_COMBINATIONS: Nested attribute listing the supported + * interface combinations. In each nested item, it contains attributes + * defined in &enum nl80211_if_combination_attrs. ++ * If the wiphy uses multiple radios (@NL80211_ATTR_WIPHY_RADIOS is set), ++ * this attribute contains the interface combinations of the first radio. ++ * See @NL80211_ATTR_WIPHY_INTERFACE_COMBINATIONS for the global wiphy ++ * combinations for the sum of all radios. + * @NL80211_ATTR_SOFTWARE_IFTYPES: Nested attribute (just like + * %NL80211_ATTR_SUPPORTED_IFTYPES) containing the interface types that + * are managed in software: interfaces of these types aren't subject to +@@ -2127,6 +2144,9 @@ enum nl80211_commands { + * @NL80211_ATTR_DISABLE_HE: Force HE capable interfaces to disable + * this feature during association. This is a flag attribute. + * Currently only supported in mac80211 drivers. ++ * @NL80211_ATTR_DISABLE_EHT: Force EHT capable interfaces to disable ++ * this feature during association. This is a flag attribute. ++ * Currently only supported in mac80211 drivers. + * @NL80211_ATTR_HT_CAPABILITY_MASK: Specify which bits of the + * ATTR_HT_CAPABILITY to which attention should be paid. + * Currently, only mac80211 NICs support this feature. +@@ -2136,6 +2156,12 @@ enum nl80211_commands { + * All values are treated as suggestions and may be ignored + * by the driver as required. The actual values may be seen in + * the station debugfs ht_caps file. ++ * @NL80211_ATTR_VHT_CAPABILITY_MASK: Specify which bits of the ++ * ATTR_VHT_CAPABILITY to which attention should be paid. ++ * Currently, only mac80211 NICs support this feature. ++ * All values are treated as suggestions and may be ignored ++ * by the driver as required. The actual values may be seen in ++ * the station debugfs vht_caps file. + * + * @NL80211_ATTR_DFS_REGION: region for regulatory rules which this country + * abides to when initiating radiation on DFS channels. A country maps +@@ -2394,7 +2420,7 @@ enum nl80211_commands { + * scheduled scan is started. Or the delay before a WoWLAN + * net-detect scan is started, counting from the moment the + * system is suspended. This value is a u32, in seconds. +- ++ * + * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device + * is operating in an indoor environment. + * +@@ -2536,7 +2562,7 @@ enum nl80211_commands { + * from successful FILS authentication and is used with + * %NL80211_CMD_CONNECT. + * +- * @NL80211_ATTR_FILS_CACHE_ID: A 2-octet identifier advertized by a FILS AP ++ * @NL80211_ATTR_FILS_CACHE_ID: A 2-octet identifier advertised by a FILS AP + * identifying the scope of PMKSAs. This is used with + * @NL80211_CMD_SET_PMKSA and @NL80211_CMD_DEL_PMKSA. + * +@@ -2690,11 +2716,13 @@ enum nl80211_commands { + * + * @NL80211_ATTR_FILS_DISCOVERY: Optional parameter to configure FILS + * discovery. It is a nested attribute, see +- * &enum nl80211_fils_discovery_attributes. ++ * &enum nl80211_fils_discovery_attributes. Userspace should pass an empty ++ * nested attribute to disable this feature and delete the templates. + * + * @NL80211_ATTR_UNSOL_BCAST_PROBE_RESP: Optional parameter to configure + * unsolicited broadcast probe response. It is a nested attribute, see +- * &enum nl80211_unsol_bcast_probe_resp_attributes. ++ * &enum nl80211_unsol_bcast_probe_resp_attributes. Userspace should pass an empty ++ * nested attribute to disable this feature and delete the templates. + * + * @NL80211_ATTR_S1G_CAPABILITY: S1G Capability information element (from + * association request when used with NL80211_CMD_NEW_STATION) +@@ -2815,6 +2843,34 @@ enum nl80211_commands { + * @NL80211_ATTR_MLO_LINK_DISABLED: Flag attribute indicating that the link is + * disabled. + * ++ * @NL80211_ATTR_BSS_DUMP_INCLUDE_USE_DATA: Include BSS usage data, i.e. ++ * include BSSes that can only be used in restricted scenarios and/or ++ * cannot be used at all. ++ * ++ * @NL80211_ATTR_MLO_TTLM_DLINK: Binary attribute specifying the downlink TID to ++ * link mapping. The length is 8 * sizeof(u16). For each TID the link ++ * mapping is as defined in section 9.4.2.314 (TID-To-Link Mapping element) ++ * in Draft P802.11be_D4.0. ++ * @NL80211_ATTR_MLO_TTLM_ULINK: Binary attribute specifying the uplink TID to ++ * link mapping. The length is 8 * sizeof(u16). For each TID the link ++ * mapping is as defined in section 9.4.2.314 (TID-To-Link Mapping element) ++ * in Draft P802.11be_D4.0. ++ * ++ * @NL80211_ATTR_ASSOC_SPP_AMSDU: flag attribute used with ++ * %NL80211_CMD_ASSOCIATE indicating the SPP A-MSDUs ++ * are used on this connection ++ * ++ * @NL80211_ATTR_WIPHY_RADIOS: Nested attribute describing physical radios ++ * belonging to this wiphy. See &enum nl80211_wiphy_radio_attrs. ++ * ++ * @NL80211_ATTR_WIPHY_INTERFACE_COMBINATIONS: Nested attribute listing the ++ * supported interface combinations for all radios combined. In each ++ * nested item, it contains attributes defined in ++ * &enum nl80211_if_combination_attrs. ++ * ++ * @NL80211_ATTR_VIF_RADIO_MASK: Bitmask of allowed radios (u32). ++ * A value of 0 means all radios. ++ * + * @NUM_NL80211_ATTR: total number of nl80211_attrs available + * @NL80211_ATTR_MAX: highest attribute number currently defined + * @__NL80211_ATTR_AFTER_LAST: internal use +@@ -3353,6 +3409,18 @@ enum nl80211_attrs { + + NL80211_ATTR_MLO_LINK_DISABLED, + ++ NL80211_ATTR_BSS_DUMP_INCLUDE_USE_DATA, ++ ++ NL80211_ATTR_MLO_TTLM_DLINK, ++ NL80211_ATTR_MLO_TTLM_ULINK, ++ ++ NL80211_ATTR_ASSOC_SPP_AMSDU, ++ ++ NL80211_ATTR_WIPHY_RADIOS, ++ NL80211_ATTR_WIPHY_INTERFACE_COMBINATIONS, ++ ++ NL80211_ATTR_VIF_RADIO_MASK, ++ + /* add attributes here, update the policy in nl80211.c */ + + __NL80211_ATTR_AFTER_LAST, +@@ -3493,6 +3561,7 @@ enum nl80211_iftype { + * @NL80211_STA_FLAG_ASSOCIATED: station is associated; used with drivers + * that support %NL80211_FEATURE_FULL_AP_CLIENT_STATE to transition a + * previously added station into associated state ++ * @NL80211_STA_FLAG_SPP_AMSDU: station supports SPP A-MSDUs + * @NL80211_STA_FLAG_MAX: highest station flag number currently defined + * @__NL80211_STA_FLAG_AFTER_LAST: internal use + */ +@@ -3505,6 +3574,7 @@ enum nl80211_sta_flags { + NL80211_STA_FLAG_AUTHENTICATED, + NL80211_STA_FLAG_TDLS_PEER, + NL80211_STA_FLAG_ASSOCIATED, ++ NL80211_STA_FLAG_SPP_AMSDU, + + /* keep last */ + __NL80211_STA_FLAG_AFTER_LAST, +@@ -3515,7 +3585,7 @@ enum nl80211_sta_flags { + * enum nl80211_sta_p2p_ps_status - station support of P2P PS + * + * @NL80211_P2P_PS_UNSUPPORTED: station doesn't support P2P PS mechanism +- * @@NL80211_P2P_PS_SUPPORTED: station supports P2P PS mechanism ++ * @NL80211_P2P_PS_SUPPORTED: station supports P2P PS mechanism + * @NUM_NL80211_P2P_PS_STATUS: number of values + */ + enum nl80211_sta_p2p_ps_status { +@@ -3553,9 +3623,9 @@ enum nl80211_he_gi { + + /** + * enum nl80211_he_ltf - HE long training field +- * @NL80211_RATE_INFO_HE_1xLTF: 3.2 usec +- * @NL80211_RATE_INFO_HE_2xLTF: 6.4 usec +- * @NL80211_RATE_INFO_HE_4xLTF: 12.8 usec ++ * @NL80211_RATE_INFO_HE_1XLTF: 3.2 usec ++ * @NL80211_RATE_INFO_HE_2XLTF: 6.4 usec ++ * @NL80211_RATE_INFO_HE_4XLTF: 12.8 usec + */ + enum nl80211_he_ltf { + NL80211_RATE_INFO_HE_1XLTF, +@@ -3670,7 +3740,7 @@ enum nl80211_eht_ru_alloc { + * @NL80211_RATE_INFO_HE_GI: HE guard interval identifier + * (u8, see &enum nl80211_he_gi) + * @NL80211_RATE_INFO_HE_DCM: HE DCM value (u8, 0/1) +- * @NL80211_RATE_INFO_RU_ALLOC: HE RU allocation, if not present then ++ * @NL80211_RATE_INFO_HE_RU_ALLOC: HE RU allocation, if not present then + * non-OFDMA was used (u8, see &enum nl80211_he_ru_alloc) + * @NL80211_RATE_INFO_320_MHZ_WIDTH: 320 MHz bitrate + * @NL80211_RATE_INFO_EHT_MCS: EHT MCS index (u8, 0-15) +@@ -3773,7 +3843,7 @@ enum nl80211_sta_bss_param { + * (u64, to this station) + * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm) + * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute +- * containing info as possible, see &enum nl80211_rate_info ++ * containing info as possible, see &enum nl80211_rate_info + * @NL80211_STA_INFO_RX_PACKETS: total received packet (MSDUs and MMPDUs) + * (u32, from this station) + * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (MSDUs and MMPDUs) +@@ -3802,8 +3872,8 @@ enum nl80211_sta_bss_param { + * Contains a nested array of signal strength attributes (u8, dBm) + * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average + * Same format as NL80211_STA_INFO_CHAIN_SIGNAL. +- * @NL80211_STA_EXPECTED_THROUGHPUT: expected throughput considering also the +- * 802.11 header (u32, kbps) ++ * @NL80211_STA_INFO_EXPECTED_THROUGHPUT: expected throughput considering also ++ * the 802.11 header (u32, kbps) + * @NL80211_STA_INFO_RX_DROP_MISC: RX packets dropped for unspecified reasons + * (u64) + * @NL80211_STA_INFO_BEACON_RX: number of beacons received from this peer (u64) +@@ -3989,7 +4059,7 @@ enum nl80211_mpath_flags { + * @NL80211_MPATH_INFO_METRIC: metric (cost) of this mesh path + * @NL80211_MPATH_INFO_EXPTIME: expiration time for the path, in msec from now + * @NL80211_MPATH_INFO_FLAGS: mesh path flags, enumerated in +- * &enum nl80211_mpath_flags; ++ * &enum nl80211_mpath_flags; + * @NL80211_MPATH_INFO_DISCOVERY_TIMEOUT: total path discovery timeout, in msec + * @NL80211_MPATH_INFO_DISCOVERY_RETRIES: mesh path discovery retries + * @NL80211_MPATH_INFO_HOP_COUNT: hop count to destination +@@ -4129,7 +4199,7 @@ enum nl80211_band_attr { + * @NL80211_WMMR_CW_MAX: Maximum contention window slot. + * @NL80211_WMMR_AIFSN: Arbitration Inter Frame Space. + * @NL80211_WMMR_TXOP: Maximum allowed tx operation time. +- * @nl80211_WMMR_MAX: highest possible wmm rule. ++ * @NL80211_WMMR_MAX: highest possible wmm rule. + * @__NL80211_WMMR_LAST: Internal use. + */ + enum nl80211_wmm_rule { +@@ -4151,15 +4221,16 @@ enum nl80211_wmm_rule { + * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current + * regulatory domain. + * @NL80211_FREQUENCY_ATTR_NO_IR: no mechanisms that initiate radiation +- * are permitted on this channel, this includes sending probe +- * requests, or modes of operation that require beaconing. ++ * are permitted on this channel, this includes sending probe ++ * requests, or modes of operation that require beaconing. ++ * @__NL80211_FREQUENCY_ATTR_NO_IBSS: obsolete, same as _NO_IR + * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory + * on this channel in current regulatory domain. + * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm + * (100 * dBm). + * @NL80211_FREQUENCY_ATTR_DFS_STATE: current state for DFS + * (enum nl80211_dfs_state) +- * @NL80211_FREQUENCY_ATTR_DFS_TIME: time in miliseconds for how long ++ * @NL80211_FREQUENCY_ATTR_DFS_TIME: time in milliseconds for how long + * this channel is in this DFS state. + * @NL80211_FREQUENCY_ATTR_NO_HT40_MINUS: HT40- isn't possible with this + * channel as the control channel +@@ -4213,6 +4284,21 @@ enum nl80211_wmm_rule { + * as the primary or any of the secondary channels isn't possible + * @NL80211_FREQUENCY_ATTR_NO_EHT: EHT operation is not allowed on this channel + * in current regulatory domain. ++ * @NL80211_FREQUENCY_ATTR_PSD: Power spectral density (in dBm) that ++ * is allowed on this channel in current regulatory domain. ++ * @NL80211_FREQUENCY_ATTR_DFS_CONCURRENT: Operation on this channel is ++ * allowed for peer-to-peer or adhoc communication under the control ++ * of a DFS master which operates on the same channel (FCC-594280 D01 ++ * Section B.3). Should be used together with %NL80211_RRF_DFS only. ++ * @NL80211_FREQUENCY_ATTR_NO_6GHZ_VLP_CLIENT: Client connection to VLP AP ++ * not allowed using this channel ++ * @NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT: Client connection to AFC AP ++ * not allowed using this channel ++ * @NL80211_FREQUENCY_ATTR_CAN_MONITOR: This channel can be used in monitor ++ * mode despite other (regulatory) restrictions, even if the channel is ++ * otherwise completely disabled. ++ * @NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP: This channel can be used for a ++ * very low power (VLP) AP, despite being NO_IR. + * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number + * currently defined + * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use +@@ -4251,6 +4337,12 @@ enum nl80211_frequency_attr { + NL80211_FREQUENCY_ATTR_16MHZ, + NL80211_FREQUENCY_ATTR_NO_320MHZ, + NL80211_FREQUENCY_ATTR_NO_EHT, ++ NL80211_FREQUENCY_ATTR_PSD, ++ NL80211_FREQUENCY_ATTR_DFS_CONCURRENT, ++ NL80211_FREQUENCY_ATTR_NO_6GHZ_VLP_CLIENT, ++ NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT, ++ NL80211_FREQUENCY_ATTR_CAN_MONITOR, ++ NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP, + + /* keep last */ + __NL80211_FREQUENCY_ATTR_AFTER_LAST, +@@ -4263,6 +4355,10 @@ enum nl80211_frequency_attr { + #define NL80211_FREQUENCY_ATTR_NO_IR NL80211_FREQUENCY_ATTR_NO_IR + #define NL80211_FREQUENCY_ATTR_GO_CONCURRENT \ + NL80211_FREQUENCY_ATTR_IR_CONCURRENT ++#define NL80211_FREQUENCY_ATTR_NO_UHB_VLP_CLIENT \ ++ NL80211_FREQUENCY_ATTR_NO_6GHZ_VLP_CLIENT ++#define NL80211_FREQUENCY_ATTR_NO_UHB_AFC_CLIENT \ ++ NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT + + /** + * enum nl80211_bitrate_attr - bitrate attributes +@@ -4285,16 +4381,16 @@ enum nl80211_bitrate_attr { + }; + + /** +- * enum nl80211_initiator - Indicates the initiator of a reg domain request ++ * enum nl80211_reg_initiator - Indicates the initiator of a reg domain request + * @NL80211_REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world +- * regulatory domain. ++ * regulatory domain. + * @NL80211_REGDOM_SET_BY_USER: User asked the wireless core to set the +- * regulatory domain. ++ * regulatory domain. + * @NL80211_REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the +- * wireless core it thinks its knows the regulatory domain we should be in. ++ * wireless core it thinks its knows the regulatory domain we should be in. + * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an +- * 802.11 country information element with regulatory information it +- * thinks we should consider. cfg80211 only processes the country ++ * 802.11 country information element with regulatory information it ++ * thinks we should consider. cfg80211 only processes the country + * code from the IE, and relies on the regulatory domain information + * structure passed by userspace (CRDA) from our wireless-regdb. + * If a channel is enabled but the country code indicates it should +@@ -4313,11 +4409,11 @@ enum nl80211_reg_initiator { + * to a specific country. When this is set you can count on the + * ISO / IEC 3166 alpha2 country code being valid. + * @NL80211_REGDOM_TYPE_WORLD: the regulatory set domain is the world regulatory +- * domain. ++ * domain. + * @NL80211_REGDOM_TYPE_CUSTOM_WORLD: the regulatory domain set is a custom +- * driver specific world regulatory domain. These do not apply system-wide +- * and are only applicable to the individual devices which have requested +- * them to be applied. ++ * driver specific world regulatory domain. These do not apply system-wide ++ * and are only applicable to the individual devices which have requested ++ * them to be applied. + * @NL80211_REGDOM_TYPE_INTERSECTION: the regulatory domain set is the product + * of an intersection between two regulatory domains -- the previously + * set regulatory domain on the system and the last accepted regulatory +@@ -4334,23 +4430,25 @@ enum nl80211_reg_type { + * enum nl80211_reg_rule_attr - regulatory rule attributes + * @__NL80211_REG_RULE_ATTR_INVALID: attribute number 0 is reserved + * @NL80211_ATTR_REG_RULE_FLAGS: a set of flags which specify additional +- * considerations for a given frequency range. These are the +- * &enum nl80211_reg_rule_flags. ++ * considerations for a given frequency range. These are the ++ * &enum nl80211_reg_rule_flags. + * @NL80211_ATTR_FREQ_RANGE_START: starting frequencry for the regulatory +- * rule in KHz. This is not a center of frequency but an actual regulatory +- * band edge. ++ * rule in KHz. This is not a center of frequency but an actual regulatory ++ * band edge. + * @NL80211_ATTR_FREQ_RANGE_END: ending frequency for the regulatory rule +- * in KHz. This is not a center a frequency but an actual regulatory +- * band edge. ++ * in KHz. This is not a center a frequency but an actual regulatory ++ * band edge. + * @NL80211_ATTR_FREQ_RANGE_MAX_BW: maximum allowed bandwidth for this + * frequency range, in KHz. + * @NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN: the maximum allowed antenna gain +- * for a given frequency range. The value is in mBi (100 * dBi). +- * If you don't have one then don't send this. ++ * for a given frequency range. The value is in mBi (100 * dBi). ++ * If you don't have one then don't send this. + * @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for +- * a given frequency range. The value is in mBm (100 * dBm). ++ * a given frequency range. The value is in mBm (100 * dBm). + * @NL80211_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds. + * If not present or 0 default CAC time will be used. ++ * @NL80211_ATTR_POWER_RULE_PSD: power spectral density (in dBm). ++ * This could be negative. + * @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number + * currently defined + * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use +@@ -4368,6 +4466,8 @@ enum nl80211_reg_rule_attr { + + NL80211_ATTR_DFS_CAC_TIME, + ++ NL80211_ATTR_POWER_RULE_PSD, ++ + /* keep last */ + __NL80211_REG_RULE_ATTR_AFTER_LAST, + NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1 +@@ -4396,14 +4496,7 @@ enum nl80211_reg_rule_attr { + * value as specified by &struct nl80211_bss_select_rssi_adjust. + * @NL80211_SCHED_SCAN_MATCH_ATTR_BSSID: BSSID to be used for matching + * (this cannot be used together with SSID). +- * @NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI: Nested attribute that carries the +- * band specific minimum rssi thresholds for the bands defined in +- * enum nl80211_band. The minimum rssi threshold value(s32) specific to a +- * band shall be encapsulated in attribute with type value equals to one +- * of the NL80211_BAND_* defined in enum nl80211_band. For example, the +- * minimum rssi threshold value for 2.4GHZ band shall be encapsulated +- * within an attribute of type NL80211_BAND_2GHZ. And one or more of such +- * attributes will be nested within this attribute. ++ * @NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI: Obsolete + * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter + * attribute number currently defined + * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use +@@ -4416,7 +4509,7 @@ enum nl80211_sched_scan_match_attr { + NL80211_SCHED_SCAN_MATCH_ATTR_RELATIVE_RSSI, + NL80211_SCHED_SCAN_MATCH_ATTR_RSSI_ADJUST, + NL80211_SCHED_SCAN_MATCH_ATTR_BSSID, +- NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI, ++ NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI, /* obsolete */ + + /* keep last */ + __NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST, +@@ -4438,8 +4531,9 @@ enum nl80211_sched_scan_match_attr { + * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links + * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links + * @NL80211_RRF_NO_IR: no mechanisms that initiate radiation are allowed, +- * this includes probe requests or modes of operation that require +- * beaconing. ++ * this includes probe requests or modes of operation that require ++ * beaconing. ++ * @__NL80211_RRF_NO_IBSS: obsolete, same as NO_IR + * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated + * base on contiguous rules and wider channels will be allowed to cross + * multiple contiguous/overlapping frequency ranges. +@@ -4451,6 +4545,15 @@ enum nl80211_sched_scan_match_attr { + * @NL80211_RRF_NO_HE: HE operation not allowed + * @NL80211_RRF_NO_320MHZ: 320MHz operation not allowed + * @NL80211_RRF_NO_EHT: EHT operation not allowed ++ * @NL80211_RRF_PSD: Ruleset has power spectral density value ++ * @NL80211_RRF_DFS_CONCURRENT: Operation on this channel is allowed for ++ * peer-to-peer or adhoc communication under the control of a DFS master ++ * which operates on the same channel (FCC-594280 D01 Section B.3). ++ * Should be used together with %NL80211_RRF_DFS only. ++ * @NL80211_RRF_NO_6GHZ_VLP_CLIENT: Client connection to VLP AP not allowed ++ * @NL80211_RRF_NO_6GHZ_AFC_CLIENT: Client connection to AFC AP not allowed ++ * @NL80211_RRF_ALLOW_6GHZ_VLP_AP: Very low power (VLP) AP can be permitted ++ * despite NO_IR configuration. + */ + enum nl80211_reg_rule_flags { + NL80211_RRF_NO_OFDM = 1<<0, +@@ -4471,6 +4574,11 @@ enum nl80211_reg_rule_flags { + NL80211_RRF_NO_HE = 1<<17, + NL80211_RRF_NO_320MHZ = 1<<18, + NL80211_RRF_NO_EHT = 1<<19, ++ NL80211_RRF_PSD = 1<<20, ++ NL80211_RRF_DFS_CONCURRENT = 1<<21, ++ NL80211_RRF_NO_6GHZ_VLP_CLIENT = 1<<22, ++ NL80211_RRF_NO_6GHZ_AFC_CLIENT = 1<<23, ++ NL80211_RRF_ALLOW_6GHZ_VLP_AP = 1<<24, + }; + + #define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR +@@ -4479,6 +4587,8 @@ enum nl80211_reg_rule_flags { + #define NL80211_RRF_NO_HT40 (NL80211_RRF_NO_HT40MINUS |\ + NL80211_RRF_NO_HT40PLUS) + #define NL80211_RRF_GO_CONCURRENT NL80211_RRF_IR_CONCURRENT ++#define NL80211_RRF_NO_UHB_VLP_CLIENT NL80211_RRF_NO_6GHZ_VLP_CLIENT ++#define NL80211_RRF_NO_UHB_AFC_CLIENT NL80211_RRF_NO_6GHZ_AFC_CLIENT + + /* For backport compatibility with older userspace */ + #define NL80211_RRF_NO_IR_ALL (NL80211_RRF_NO_IR | __NL80211_RRF_NO_IBSS) +@@ -4593,6 +4703,7 @@ enum nl80211_survey_info { + * overrides all other flags. + * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address + * and ACK incoming unicast packets. ++ * @NL80211_MNTR_FLAG_SKIP_TX: do not pass local tx packets + * + * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use + * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag +@@ -4605,6 +4716,7 @@ enum nl80211_mntr_flags { + NL80211_MNTR_FLAG_OTHER_BSS, + NL80211_MNTR_FLAG_COOK_FRAMES, + NL80211_MNTR_FLAG_ACTIVE, ++ NL80211_MNTR_FLAG_SKIP_TX, + + /* keep last */ + __NL80211_MNTR_FLAG_AFTER_LAST, +@@ -4625,8 +4737,8 @@ enum nl80211_mntr_flags { + * alternate between Active and Doze states, but may not wake up + * for neighbor's beacons. + * +- * @__NL80211_MESH_POWER_AFTER_LAST - internal use +- * @NL80211_MESH_POWER_MAX - highest possible power save level ++ * @__NL80211_MESH_POWER_AFTER_LAST: internal use ++ * @NL80211_MESH_POWER_MAX: highest possible power save level + */ + + enum nl80211_mesh_power_mode { +@@ -5008,6 +5120,36 @@ enum nl80211_bss_scan_width { + }; + + /** ++ * enum nl80211_bss_use_for - bitmap indicating possible BSS use ++ * @NL80211_BSS_USE_FOR_NORMAL: Use this BSS for normal "connection", ++ * including IBSS/MBSS depending on the type. ++ * @NL80211_BSS_USE_FOR_MLD_LINK: This BSS can be used as a link in an ++ * MLO connection. Note that for an MLO connection, all links including ++ * the assoc link must have this flag set, and the assoc link must ++ * additionally have %NL80211_BSS_USE_FOR_NORMAL set. ++ */ ++enum nl80211_bss_use_for { ++ NL80211_BSS_USE_FOR_NORMAL = 1 << 0, ++ NL80211_BSS_USE_FOR_MLD_LINK = 1 << 1, ++}; ++ ++/** ++ * enum nl80211_bss_cannot_use_reasons - reason(s) connection to a ++ * BSS isn't possible ++ * @NL80211_BSS_CANNOT_USE_NSTR_NONPRIMARY: NSTR nonprimary links aren't ++ * supported by the device, and this BSS entry represents one. ++ * @NL80211_BSS_CANNOT_USE_6GHZ_PWR_MISMATCH: STA is not supporting ++ * the AP power type (SP, VLP, AP) that the AP uses. ++ */ ++enum nl80211_bss_cannot_use_reasons { ++ NL80211_BSS_CANNOT_USE_NSTR_NONPRIMARY = 1 << 0, ++ NL80211_BSS_CANNOT_USE_6GHZ_PWR_MISMATCH = 1 << 1, ++}; ++ ++#define NL80211_BSS_CANNOT_USE_UHB_PWR_MISMATCH \ ++ NL80211_BSS_CANNOT_USE_6GHZ_PWR_MISMATCH ++ ++/** + * enum nl80211_bss - netlink attributes for a BSS + * + * @__NL80211_BSS_INVALID: invalid +@@ -5038,7 +5180,7 @@ enum nl80211_bss_scan_width { + * elements from a Beacon frame (bin); not present if no Beacon frame has + * yet been received + * @NL80211_BSS_CHAN_WIDTH: channel width of the control channel +- * (u32, enum nl80211_bss_scan_width) ++ * (u32, enum nl80211_bss_scan_width) - No longer used! + * @NL80211_BSS_BEACON_TSF: TSF of the last received beacon (u64) + * (not present if no beacon frame has been received yet) + * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and +@@ -5059,6 +5201,14 @@ enum nl80211_bss_scan_width { + * @NL80211_BSS_FREQUENCY_OFFSET: frequency offset in KHz + * @NL80211_BSS_MLO_LINK_ID: MLO link ID of the BSS (u8). + * @NL80211_BSS_MLD_ADDR: MLD address of this BSS if connected to it. ++ * @NL80211_BSS_USE_FOR: u32 bitmap attribute indicating what the BSS can be ++ * used for, see &enum nl80211_bss_use_for. ++ * @NL80211_BSS_CANNOT_USE_REASONS: Indicates the reason that this BSS cannot ++ * be used for all or some of the possible uses by the device reporting it, ++ * even though its presence was detected. ++ * This is a u64 attribute containing a bitmap of values from ++ * &enum nl80211_cannot_use_reasons, note that the attribute may be missing ++ * if no reasons are specified. + * @__NL80211_BSS_AFTER_LAST: internal + * @NL80211_BSS_MAX: highest BSS attribute + */ +@@ -5086,6 +5236,8 @@ enum nl80211_bss { + NL80211_BSS_FREQUENCY_OFFSET, + NL80211_BSS_MLO_LINK_ID, + NL80211_BSS_MLD_ADDR, ++ NL80211_BSS_USE_FOR, ++ NL80211_BSS_CANNOT_USE_REASONS, + + /* keep last */ + __NL80211_BSS_AFTER_LAST, +@@ -5434,7 +5586,7 @@ enum nl80211_tx_rate_setting { + * (%NL80211_TID_CONFIG_ATTR_TIDS, %NL80211_TID_CONFIG_ATTR_OVERRIDE). + * @NL80211_TID_CONFIG_ATTR_PEER_SUPP: same as the previous per-vif one, but + * per peer instead. +- * @NL80211_TID_CONFIG_ATTR_OVERRIDE: flag attribue, if set indicates ++ * @NL80211_TID_CONFIG_ATTR_OVERRIDE: flag attribute, if set indicates + * that the new configuration overrides all previous peer + * configurations, otherwise previous peer specific configurations + * should be left untouched. +@@ -5606,7 +5758,7 @@ struct nl80211_pattern_support { + * "TCP connection wakeup" for more details. This is a nested attribute + * containing the exact information for establishing and keeping alive + * the TCP connection. +- * @NL80211_WOWLAN_TRIG_TCP_WAKEUP_MATCH: For wakeup reporting only, the ++ * @NL80211_WOWLAN_TRIG_WAKEUP_TCP_MATCH: For wakeup reporting only, the + * wakeup packet was received on the TCP connection + * @NL80211_WOWLAN_TRIG_WAKEUP_TCP_CONNLOST: For wakeup reporting only, the + * TCP connection was lost or failed to be established +@@ -5635,6 +5787,8 @@ struct nl80211_pattern_support { + * %NL80211_ATTR_SCAN_FREQUENCIES contains more than one + * frequency, it means that the match occurred in more than one + * channel. ++ * @NL80211_WOWLAN_TRIG_UNPROTECTED_DEAUTH_DISASSOC: For wakeup reporting only. ++ * Wake up happened due to unprotected deauth or disassoc frame in MFP. + * @NUM_NL80211_WOWLAN_TRIG: number of wake on wireless triggers + * @MAX_NL80211_WOWLAN_TRIG: highest wowlan trigger attribute number + * +@@ -5662,6 +5816,7 @@ enum nl80211_wowlan_triggers { + NL80211_WOWLAN_TRIG_WAKEUP_TCP_NOMORETOKENS, + NL80211_WOWLAN_TRIG_NET_DETECT, + NL80211_WOWLAN_TRIG_NET_DETECT_RESULTS, ++ NL80211_WOWLAN_TRIG_UNPROTECTED_DEAUTH_DISASSOC, + + /* keep last */ + NUM_NL80211_WOWLAN_TRIG, +@@ -5817,7 +5972,7 @@ enum nl80211_attr_coalesce_rule { + + /** + * enum nl80211_coalesce_condition - coalesce rule conditions +- * @NL80211_COALESCE_CONDITION_MATCH: coalaesce Rx packets when patterns ++ * @NL80211_COALESCE_CONDITION_MATCH: coalesce Rx packets when patterns + * in a rule are matched. + * @NL80211_COALESCE_CONDITION_NO_MATCH: coalesce Rx packets when patterns + * in a rule are not matched. +@@ -5916,7 +6071,7 @@ enum nl80211_if_combination_attrs { + * enum nl80211_plink_state - state of a mesh peer link finite state machine + * + * @NL80211_PLINK_LISTEN: initial state, considered the implicit +- * state of non existent mesh peer links ++ * state of non-existent mesh peer links + * @NL80211_PLINK_OPN_SNT: mesh plink open frame has been sent to + * this mesh peer + * @NL80211_PLINK_OPN_RCVD: mesh plink open frame has been received +@@ -5952,7 +6107,7 @@ enum nl80211_plink_state { + * @NL80211_PLINK_ACTION_BLOCK: block traffic from this mesh peer + * @NUM_NL80211_PLINK_ACTIONS: number of possible actions + */ +-enum plink_actions { ++enum nl80211_plink_action { + NL80211_PLINK_ACTION_NO_ACTION, + NL80211_PLINK_ACTION_OPEN, + NL80211_PLINK_ACTION_BLOCK, +@@ -6209,7 +6364,7 @@ enum nl80211_feature_flags { + * request to use RRM (see %NL80211_ATTR_USE_RRM) with + * %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set + * the ASSOC_REQ_USE_RRM flag in the association request even if +- * NL80211_FEATURE_QUIET is not advertized. ++ * NL80211_FEATURE_QUIET is not advertised. + * @NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER: This device supports MU-MIMO air + * sniffer which means that it can be configured to hear packets from + * certain groups which can be configured by the +@@ -6221,13 +6376,15 @@ enum nl80211_feature_flags { + * the BSS that the interface that requested the scan is connected to + * (if available). + * @NL80211_EXT_FEATURE_BSS_PARENT_TSF: Per BSS, this driver reports the +- * time the last beacon/probe was received. The time is the TSF of the +- * BSS that the interface that requested the scan is connected to +- * (if available). ++ * time the last beacon/probe was received. For a non-MLO connection, the ++ * time is the TSF of the BSS that the interface that requested the scan is ++ * connected to (if available). For an MLO connection, the time is the TSF ++ * of the BSS corresponding with link ID specified in the scan request (if ++ * specified). + * @NL80211_EXT_FEATURE_SET_SCAN_DWELL: This driver supports configuration of + * channel dwell time. + * @NL80211_EXT_FEATURE_BEACON_RATE_LEGACY: Driver supports beacon rate +- * configuration (AP/mesh), supporting a legacy (non HT/VHT) rate. ++ * configuration (AP/mesh), supporting a legacy (non-HT/VHT) rate. + * @NL80211_EXT_FEATURE_BEACON_RATE_HT: Driver supports beacon rate + * configuration (AP/mesh) with HT rates. + * @NL80211_EXT_FEATURE_BEACON_RATE_VHT: Driver supports beacon rate +@@ -6277,6 +6434,7 @@ enum nl80211_feature_flags { + * receiving control port frames over nl80211 instead of the netdevice. + * @NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT: This driver/device supports + * (average) ACK signal strength reporting. ++ * @NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT: Backward-compatible ID + * @NL80211_EXT_FEATURE_TXQS: Driver supports FQ-CoDel-enabled intermediate + * TXQs. + * @NL80211_EXT_FEATURE_SCAN_RANDOM_SN: Driver/device supports randomizing the +@@ -6301,8 +6459,7 @@ enum nl80211_feature_flags { + * @NL80211_EXT_FEATURE_AP_PMKSA_CACHING: Driver/device supports PMKSA caching + * (set/del PMKSA operations) in AP mode. + * +- * @NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD: Driver supports +- * filtering of sched scan results using band specific RSSI thresholds. ++ * @NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD: Obsolete + * + * @NL80211_EXT_FEATURE_STA_TX_PWR: This driver supports controlling tx power + * to a station. +@@ -6400,6 +6557,22 @@ enum nl80211_feature_flags { + * in authentication and deauthentication frames sent to unassociated peer + * using @NL80211_CMD_FRAME. + * ++ * @NL80211_EXT_FEATURE_OWE_OFFLOAD: Driver/Device wants to do OWE DH IE ++ * handling in station mode. ++ * ++ * @NL80211_EXT_FEATURE_OWE_OFFLOAD_AP: Driver/Device wants to do OWE DH IE ++ * handling in AP mode. ++ * ++ * @NL80211_EXT_FEATURE_DFS_CONCURRENT: The device supports peer-to-peer or ++ * ad hoc operation on DFS channels under the control of a concurrent ++ * DFS master on the same channel as described in FCC-594280 D01 ++ * (Section B.3). This, for example, allows P2P GO and P2P clients to ++ * operate on DFS channels as long as there's a concurrent BSS connection. ++ * ++ * @NL80211_EXT_FEATURE_SPP_AMSDU_SUPPORT: The driver has support for SPP ++ * (signaling and payload protected) A-MSDUs and this shall be advertised ++ * in the RSNXE. ++ * + * @NUM_NL80211_EXT_FEATURES: number of extended features. + * @MAX_NL80211_EXT_FEATURES: highest extended feature index. + */ +@@ -6441,7 +6614,7 @@ enum nl80211_ext_feature_index { + NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER, + NL80211_EXT_FEATURE_AIRTIME_FAIRNESS, + NL80211_EXT_FEATURE_AP_PMKSA_CACHING, +- NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD, ++ NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD, /* obsolete */ + NL80211_EXT_FEATURE_EXT_KEY_ID, + NL80211_EXT_FEATURE_STA_TX_PWR, + NL80211_EXT_FEATURE_SAE_OFFLOAD, +@@ -6471,6 +6644,10 @@ enum nl80211_ext_feature_index { + NL80211_EXT_FEATURE_PUNCT, + NL80211_EXT_FEATURE_SECURE_NAN, + NL80211_EXT_FEATURE_AUTH_AND_DEAUTH_RANDOM_TA, ++ NL80211_EXT_FEATURE_OWE_OFFLOAD, ++ NL80211_EXT_FEATURE_OWE_OFFLOAD_AP, ++ NL80211_EXT_FEATURE_DFS_CONCURRENT, ++ NL80211_EXT_FEATURE_SPP_AMSDU_SUPPORT, + + /* add new features before the definition below */ + NUM_NL80211_EXT_FEATURES, +@@ -6555,7 +6732,7 @@ enum nl80211_timeout_reason { + * request parameters IE in the probe request + * @NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP: accept broadcast probe responses + * @NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE: send probe request frames at +- * rate of at least 5.5M. In case non OCE AP is discovered in the channel, ++ * rate of at least 5.5M. In case non-OCE AP is discovered in the channel, + * only the first probe req in the channel will be sent in high rate. + * @NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION: allow probe request + * tx deferral (dot11FILSProbeDelay shall be set to 15ms) +@@ -6591,7 +6768,7 @@ enum nl80211_timeout_reason { + * received on the 2.4/5 GHz channels to actively scan only the 6GHz + * channels on which APs are expected to be found. Note that when not set, + * the scan logic would scan all 6GHz channels, but since transmission of +- * probe requests on non PSC channels is limited, it is highly likely that ++ * probe requests on non-PSC channels is limited, it is highly likely that + * these channels would passively be scanned. Also note that when the flag + * is set, in addition to the colocated APs, PSC channels would also be + * scanned if the user space has asked for it. +@@ -6641,6 +6818,8 @@ enum nl80211_acl_policy { + * @NL80211_SMPS_STATIC: static SMPS (use a single antenna) + * @NL80211_SMPS_DYNAMIC: dynamic smps (start with a single antenna and + * turn on other antennas after CTS/RTS). ++ * @__NL80211_SMPS_AFTER_LAST: internal ++ * @NL80211_SMPS_MAX: highest used enumeration + */ + enum nl80211_smps_mode { + NL80211_SMPS_OFF, +@@ -6671,14 +6850,6 @@ enum nl80211_smps_mode { + * applicable for ETSI dfs domain where pre-CAC is valid for ever. + * @NL80211_RADAR_CAC_STARTED: Channel Availability Check has been started, + * should be generated by HW if NL80211_EXT_FEATURE_DFS_OFFLOAD is enabled. +- * @NL80211_RADAR_BACKGROUND_CHAN_UPDATE: background channel is updated by the +- * driver. +- * @NL80211_RADAR_BACKGROUND_CHAN_EXPAND: background channel is updated by the +- * driver and required to expand main operating channel. +- * @NL80211_RADAR_STA_CAC_SKIPPED: STA set the DFS state to available +- * when receiving CSA/assoc resp +- * @NL80211_RADAR_STA_CAC_EXPIRED: STA set the DFS state to usable +- * when STA is disconnected or leaving the channel + */ + enum nl80211_radar_event { + NL80211_RADAR_DETECTED, +@@ -6687,10 +6858,6 @@ enum nl80211_radar_event { + NL80211_RADAR_NOP_FINISHED, + NL80211_RADAR_PRE_CAC_EXPIRED, + NL80211_RADAR_CAC_STARTED, +- NL80211_RADAR_BACKGROUND_CHAN_UPDATE, +- NL80211_RADAR_BACKGROUND_CHAN_EXPAND, +- NL80211_RADAR_STA_CAC_SKIPPED, +- NL80211_RADAR_STA_CAC_EXPIRED, + }; + + /** +@@ -6874,6 +7041,8 @@ enum nl80211_bss_select_attr { + * @NL80211_NAN_FUNC_PUBLISH: function is publish + * @NL80211_NAN_FUNC_SUBSCRIBE: function is subscribe + * @NL80211_NAN_FUNC_FOLLOW_UP: function is follow-up ++ * @__NL80211_NAN_FUNC_TYPE_AFTER_LAST: internal use ++ * @NL80211_NAN_FUNC_MAX_TYPE: internal use + */ + enum nl80211_nan_function_type { + NL80211_NAN_FUNC_PUBLISH, +@@ -6935,7 +7104,7 @@ enum nl80211_nan_func_term_reason { + * The instance ID for the follow up Service Discovery Frame. This is u8. + * @NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID: relevant if the function's type + * is follow up. This is a u8. +- * The requestor instance ID for the follow up Service Discovery Frame. ++ * The requester instance ID for the follow up Service Discovery Frame. + * @NL80211_NAN_FUNC_FOLLOW_UP_DEST: the MAC address of the recipient of the + * follow up Service Discovery Frame. This is a binary attribute. + * @NL80211_NAN_FUNC_CLOSE_RANGE: is this function limited for devices in a +@@ -7034,7 +7203,7 @@ enum nl80211_nan_match_attributes { + }; + + /** +- * nl80211_external_auth_action - Action to perform with external ++ * enum nl80211_external_auth_action - Action to perform with external + * authentication request. Used by NL80211_ATTR_EXTERNAL_AUTH_ACTION. + * @NL80211_EXTERNAL_AUTH_START: Start the authentication. + * @NL80211_EXTERNAL_AUTH_ABORT: Abort the ongoing authentication. +@@ -7052,7 +7221,7 @@ enum nl80211_external_auth_action { + * @NL80211_FTM_RESP_ATTR_LCI: The content of Measurement Report Element + * (9.4.2.22 in 802.11-2016) with type 8 - LCI (9.4.2.22.10), + * i.e. starting with the measurement token +- * @NL80211_FTM_RESP_ATTR_CIVIC: The content of Measurement Report Element ++ * @NL80211_FTM_RESP_ATTR_CIVICLOC: The content of Measurement Report Element + * (9.4.2.22 in 802.11-2016) with type 11 - Civic (Section 9.4.2.22.13), + * i.e. starting with the measurement token + * @__NL80211_FTM_RESP_ATTR_LAST: Internal +@@ -7325,7 +7494,7 @@ enum nl80211_peer_measurement_attrs { + * @NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED: flag attribute indicating if + * trigger based ranging measurement is supported + * @NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED: flag attribute indicating +- * if non trigger based ranging measurement is supported ++ * if non-trigger-based ranging measurement is supported + * + * @NUM_NL80211_PMSR_FTM_CAPA_ATTR: internal + * @NL80211_PMSR_FTM_CAPA_ATTR_MAX: highest attribute number +@@ -7379,7 +7548,7 @@ enum nl80211_peer_measurement_ftm_capa { + * if neither %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED nor + * %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set, EDCA based + * ranging will be used. +- * @NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED: request non trigger based ++ * @NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED: request non-trigger-based + * ranging measurement (flag) + * This attribute and %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED are + * mutually exclusive. +@@ -7457,7 +7626,7 @@ enum nl80211_peer_measurement_ftm_failur + * @NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_ATTEMPTS: number of FTM Request frames + * transmitted (u32, optional) + * @NL80211_PMSR_FTM_RESP_ATTR_NUM_FTMR_SUCCESSES: number of FTM Request frames +- * that were acknowleged (u32, optional) ++ * that were acknowledged (u32, optional) + * @NL80211_PMSR_FTM_RESP_ATTR_BUSY_RETRY_TIME: retry time received from the + * busy peer (u32, seconds) + * @NL80211_PMSR_FTM_RESP_ATTR_NUM_BURSTS_EXP: actual number of bursts exponent +@@ -7618,7 +7787,7 @@ enum nl80211_iftype_akm_attributes { + * @NL80211_FILS_DISCOVERY_ATTR_INT_MIN: Minimum packet interval (u32, TU). + * Allowed range: 0..10000 (TU = Time Unit) + * @NL80211_FILS_DISCOVERY_ATTR_INT_MAX: Maximum packet interval (u32, TU). +- * Allowed range: 0..10000 (TU = Time Unit) ++ * Allowed range: 0..10000 (TU = Time Unit). If set to 0, the feature is disabled. + * @NL80211_FILS_DISCOVERY_ATTR_TMPL: Template data for FILS discovery action + * frame including the headers. + * +@@ -7631,7 +7800,6 @@ enum nl80211_fils_discovery_attributes { + NL80211_FILS_DISCOVERY_ATTR_INT_MIN, + NL80211_FILS_DISCOVERY_ATTR_INT_MAX, + NL80211_FILS_DISCOVERY_ATTR_TMPL, +- NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INTE, + + /* keep last */ + __NL80211_FILS_DISCOVERY_ATTR_LAST, +@@ -7652,7 +7820,8 @@ enum nl80211_fils_discovery_attributes { + * + * @NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT: Maximum packet interval (u32, TU). + * Allowed range: 0..20 (TU = Time Unit). IEEE P802.11ax/D6.0 +- * 26.17.2.3.2 (AP behavior for fast passive scanning). ++ * 26.17.2.3.2 (AP behavior for fast passive scanning). If set to 0, the feature is ++ * disabled. + * @NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL: Unsolicited broadcast probe response + * frame template (binary). + * +@@ -7695,6 +7864,7 @@ enum nl80211_sae_pwe_mechanism { + * + * @NL80211_SAR_TYPE_POWER: power limitation specified in 0.25dBm unit + * ++ * @NUM_NL80211_SAR_TYPE: internal + */ + enum nl80211_sar_type { + NL80211_SAR_TYPE_POWER, +@@ -7708,6 +7878,8 @@ enum nl80211_sar_type { + /** + * enum nl80211_sar_attrs - Attributes for SAR spec + * ++ * @__NL80211_SAR_ATTR_INVALID: Invalid ++ * + * @NL80211_SAR_ATTR_TYPE: the SAR type as defined in &enum nl80211_sar_type. + * + * @NL80211_SAR_ATTR_SPECS: Nested array of SAR power +@@ -7739,6 +7911,8 @@ enum nl80211_sar_attrs { + /** + * enum nl80211_sar_specs_attrs - Attributes for SAR power limit specs + * ++ * @__NL80211_SAR_ATTR_SPECS_INVALID: Invalid ++ * + * @NL80211_SAR_ATTR_SPECS_POWER: Required (s32)value to specify the actual + * power limit value in units of 0.25 dBm if type is + * NL80211_SAR_TYPE_POWER. (i.e., a value of 44 represents 11 dBm). +@@ -7853,4 +8027,54 @@ enum nl80211_ap_settings_flags { + NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT = 1 << 1, + }; + ++/** ++ * enum nl80211_wiphy_radio_attrs - wiphy radio attributes ++ * ++ * @__NL80211_WIPHY_RADIO_ATTR_INVALID: Invalid ++ * ++ * @NL80211_WIPHY_RADIO_ATTR_INDEX: Index of this radio (u32) ++ * @NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE: Frequency range supported by this ++ * radio. Attribute may be present multiple times. ++ * @NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION: Supported interface ++ * combination for this radio. Attribute may be present multiple times ++ * and contains attributes defined in &enum nl80211_if_combination_attrs. ++ * ++ * @__NL80211_WIPHY_RADIO_ATTR_LAST: Internal ++ * @NL80211_WIPHY_RADIO_ATTR_MAX: Highest attribute ++ */ ++enum nl80211_wiphy_radio_attrs { ++ __NL80211_WIPHY_RADIO_ATTR_INVALID, ++ ++ NL80211_WIPHY_RADIO_ATTR_INDEX, ++ NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE, ++ NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION, ++ ++ /* keep last */ ++ __NL80211_WIPHY_RADIO_ATTR_LAST, ++ NL80211_WIPHY_RADIO_ATTR_MAX = __NL80211_WIPHY_RADIO_ATTR_LAST - 1, ++}; ++ ++/** ++ * enum nl80211_wiphy_radio_freq_range - wiphy radio frequency range ++ * ++ * @__NL80211_WIPHY_RADIO_FREQ_ATTR_INVALID: Invalid ++ * ++ * @NL80211_WIPHY_RADIO_FREQ_ATTR_START: Frequency range start (u32). ++ * The unit is kHz. ++ * @NL80211_WIPHY_RADIO_FREQ_ATTR_END: Frequency range end (u32). ++ * The unit is kHz. ++ * ++ * @__NL80211_WIPHY_RADIO_FREQ_ATTR_LAST: Internal ++ * @NL80211_WIPHY_RADIO_FREQ_ATTR_MAX: Highest attribute ++ */ ++enum nl80211_wiphy_radio_freq_range { ++ __NL80211_WIPHY_RADIO_FREQ_ATTR_INVALID, ++ ++ NL80211_WIPHY_RADIO_FREQ_ATTR_START, ++ NL80211_WIPHY_RADIO_FREQ_ATTR_END, ++ ++ __NL80211_WIPHY_RADIO_FREQ_ATTR_LAST, ++ NL80211_WIPHY_RADIO_FREQ_ATTR_MAX = __NL80211_WIPHY_RADIO_FREQ_ATTR_LAST - 1, ++}; ++ + #endif /* __LINUX_NL80211_H */ +--- a/iwinfo_nl80211.c ++++ b/iwinfo_nl80211.c +@@ -37,6 +37,11 @@ + + static struct nl80211_state *nls = NULL; + ++struct nl80211_if_data { ++ int mode; ++ int radio_idx; ++}; ++ + static void nl80211_close(void) + { + if (nls) +@@ -862,7 +867,7 @@ static char * nl80211_phy2ifname(const c + + static int nl80211_get_mode_cb(struct nl_msg *msg, void *arg) + { +- int *mode = arg; ++ struct nl80211_if_data *data = arg; + struct nlattr **tb = nl80211_parse(msg); + const int ifmodes[NL80211_IFTYPE_MAX + 1] = { + IWINFO_OPMODE_UNKNOWN, /* unspecified */ +@@ -878,37 +883,57 @@ static int nl80211_get_mode_cb(struct nl + }; + + if (tb[NL80211_ATTR_IFTYPE]) +- *mode = ifmodes[nla_get_u32(tb[NL80211_ATTR_IFTYPE])]; ++ data->mode = ifmodes[nla_get_u32(tb[NL80211_ATTR_IFTYPE])]; ++ ++ if (tb[NL80211_ATTR_VIF_RADIO_MASK]) { ++ uint32_t mask = nla_get_u32(tb[NL80211_ATTR_VIF_RADIO_MASK]); ++ ++ for (int i = 0; mask && i < 32; i++, mask >>= 1) ++ if (mask & 1) ++ data->radio_idx = i; ++ } + + return NL_SKIP; + } + + +-static int nl80211_get_mode(const char *ifname, int *buf) ++static int nl80211_get_if_data(const char *ifname, struct nl80211_if_data *data) + { + char *res; + +- *buf = IWINFO_OPMODE_UNKNOWN; +- + res = nl80211_phy2ifname(ifname); + ++ data->mode = IWINFO_OPMODE_UNKNOWN; ++ data->radio_idx = -1; + nl80211_request(res ? res : ifname, NL80211_CMD_GET_INTERFACE, 0, +- nl80211_get_mode_cb, buf); ++ nl80211_get_mode_cb, data); + +- return (*buf == IWINFO_OPMODE_UNKNOWN) ? -1 : 0; ++ return (data->mode == IWINFO_OPMODE_UNKNOWN) ? -1 : 0; ++} ++ ++static int nl80211_get_mode(const char *ifname, int *buf) ++{ ++ struct nl80211_if_data data = {}; ++ int ret; ++ ++ ret = nl80211_get_if_data(ifname, &data); ++ *buf = data.mode; ++ ++ return ret; + } + + static int __nl80211_hostapd_query(const char *ifname, ...) + { ++ struct nl80211_if_data data = {}; + va_list ap, ap_cur; + char *phy, *search, *dest, *key, *val, buf[128]; +- int len, mode, found = 0, match = 1; ++ int len, found = 0, match = 1; + FILE *fp; + +- if (nl80211_get_mode(ifname, &mode)) ++ if (nl80211_get_if_data(ifname, &data)) + return 0; + +- if (mode != IWINFO_OPMODE_MASTER && mode != IWINFO_OPMODE_AP_VLAN) ++ if (data.mode != IWINFO_OPMODE_MASTER && data.mode != IWINFO_OPMODE_AP_VLAN) + return 0; + + phy = nl80211_ifname2phy(ifname); +@@ -916,7 +941,10 @@ static int __nl80211_hostapd_query(const + if (!phy) + return 0; + +- snprintf(buf, sizeof(buf), "/var/run/hostapd-%s.conf", phy); ++ if (data.radio_idx >= 0) ++ snprintf(buf, sizeof(buf), "/var/run/hostapd-%s.%d.conf", phy, data.radio_idx); ++ else ++ snprintf(buf, sizeof(buf), "/var/run/hostapd-%s.conf", phy); + fp = fopen(buf, "r"); + + if (!fp) -- 2.30.2