-diff --git a/nl80211.h b/nl80211.h
-index c587a61..255a971 100644
--- a/nl80211.h
+++ b/nl80211.h
-@@ -11,6 +11,7 @@
+@@ -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 Intel Corporation
+- * Copyright (C) 2018-2019 Intel Corporation
++ * Copyright (C) 2018-2020 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
-@@ -203,7 +204,8 @@
- * FILS shared key authentication offload should be able to construct the
- * authentication and association frames for FILS shared key authentication and
- * eventually do a key derivation as per IEEE 802.11ai. The below additional
-- * parameters should be given to driver in %NL80211_CMD_CONNECT.
-+ * parameters should be given to driver in %NL80211_CMD_CONNECT and/or in
-+ * %NL80211_CMD_UPDATE_CONNECT_PARAMS.
- * %NL80211_ATTR_FILS_ERP_USERNAME - used to construct keyname_nai
- * %NL80211_ATTR_FILS_ERP_REALM - used to construct keyname_nai
- * %NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM - used to construct erp message
-@@ -214,7 +216,8 @@
- * as specified in IETF RFC 6696.
+@@ -249,6 +249,45 @@
+ */
+
+ /**
++ * DOC: VLAN offload support for setting group keys and binding STAs to VLANs
++ *
++ * By setting @NL80211_EXT_FEATURE_VLAN_OFFLOAD flag drivers can indicate they
++ * support offloading VLAN functionality in a manner where the driver exposes a
++ * single netdev that uses VLAN tagged frames and separate VLAN-specific netdevs
++ * can then be added using RTM_NEWLINK/IFLA_VLAN_ID similarly to the Ethernet
++ * case. Frames received from stations that are not assigned to any VLAN are
++ * delivered on the main netdev and frames to such stations can be sent through
++ * that main netdev.
++ *
++ * %NL80211_CMD_NEW_KEY (for group keys), %NL80211_CMD_NEW_STATION, and
++ * %NL80211_CMD_SET_STATION will optionally specify vlan_id using
++ * %NL80211_ATTR_VLAN_ID.
++ */
++
++/**
++ * DOC: TID configuration
++ *
++ * TID config support can be checked in the %NL80211_ATTR_TID_CONFIG
++ * attribute given in wiphy capabilities.
++ *
++ * The necessary configuration parameters are mentioned in
++ * &enum nl80211_tid_config_attr and it will be passed to the
++ * %NL80211_CMD_SET_TID_CONFIG command in %NL80211_ATTR_TID_CONFIG.
++ *
++ * 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
++ * 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
++ * after disconnection/roaming, and this configuration will be cleared when
++ * the interface goes down.
++ */
++
++/**
+ * enum nl80211_commands - supported nl80211 commands
*
- * When FILS shared key authentication is completed, driver needs to provide the
-- * below additional parameters to userspace.
-+ * below additional parameters to userspace, which can be either after setting
-+ * up a connection or after roaming.
- * %NL80211_ATTR_FILS_KEK - used for key renewal
- * %NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM - used in further EAP-RP exchanges
- * %NL80211_ATTR_PMKID - used to identify the PMKSA used/generated
-@@ -542,7 +545,8 @@
- * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
- * %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
+ * @NL80211_CMD_UNSPEC: unspecified command to catch errors
+@@ -257,13 +296,14 @@
+ * to get a list of all present wiphys.
+ * @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or
+ * %NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,
+- * %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ (and the
+- * attributes determining the channel width; this is used for setting
+- * monitor mode channel), %NL80211_ATTR_WIPHY_RETRY_SHORT,
+- * %NL80211_ATTR_WIPHY_RETRY_LONG, %NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
+- * and/or %NL80211_ATTR_WIPHY_RTS_THRESHOLD.
+- * However, for setting the channel, see %NL80211_CMD_SET_CHANNEL
+- * instead, the support here is for backward compatibility only.
++ * %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ,
++ * %NL80211_ATTR_WIPHY_FREQ_OFFSET (and the attributes determining the
++ * channel width; this is used for setting monitor mode channel),
++ * %NL80211_ATTR_WIPHY_RETRY_SHORT, %NL80211_ATTR_WIPHY_RETRY_LONG,
++ * %NL80211_ATTR_WIPHY_FRAG_THRESHOLD, and/or
++ * %NL80211_ATTR_WIPHY_RTS_THRESHOLD. However, for setting the channel,
++ * see %NL80211_CMD_SET_CHANNEL instead, the support here is for backward
++ * compatibility only.
+ * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
+ * or rename notification. Has attributes %NL80211_ATTR_WIPHY and
+ * %NL80211_ATTR_WIPHY_NAME.
+@@ -312,7 +352,8 @@
+ * %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_INACTIVITY_TIMEOUT,
+ * %NL80211_ATTR_ACL_POLICY and %NL80211_ATTR_MAC_ADDRS.
+ * The channel to use can be set on the interface or be given using the
+- * %NL80211_ATTR_WIPHY_FREQ and the attributes determining channel width.
++ * %NL80211_ATTR_WIPHY_FREQ and %NL80211_ATTR_WIPHY_FREQ_OFFSET, and the
++ * attributes determining channel width.
+ * @NL80211_CMD_NEW_BEACON: old alias for %NL80211_CMD_START_AP
+ * @NL80211_CMD_STOP_AP: Stop AP operation on the given interface
+ * @NL80211_CMD_DEL_BEACON: old alias for %NL80211_CMD_STOP_AP
+@@ -497,11 +538,12 @@
+ * interface. %NL80211_ATTR_MAC is used to specify PeerSTAAddress (and
+ * 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 is used
+- * to specify the frequence 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 to the frame.
++ * request, too, to help BSS selection. %NL80211_ATTR_WIPHY_FREQ +
++ * %NL80211_ATTR_WIPHY_FREQ_OFFSET is used to specify the frequence 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
++ * to the frame.
+ * When used as an event, this reports reception of an Authentication
+ * frame in station and IBSS modes when the local MLME processed the
+ * frame, i.e., it was for the local STA and was received in correct
+@@ -556,8 +598,9 @@
+ * requests to connect to a specified network but without separating
+ * auth and assoc steps. For this, you need to specify the SSID in a
+ * %NL80211_ATTR_SSID attribute, and can optionally specify the association
+- * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
+- * %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
++ * IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE,
++ * %NL80211_ATTR_USE_MFP, %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ,
++ * %NL80211_ATTR_WIPHY_FREQ_OFFSET, %NL80211_ATTR_CONTROL_PORT,
* %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
-- * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and
-+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
-+ * %NL80211_ATTR_CONTROL_PORT_OVER_NL80211, %NL80211_ATTR_MAC_HINT, and
- * %NL80211_ATTR_WIPHY_FREQ_HINT.
- * If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are
- * restrictions on BSS selection, i.e., they effectively prevent roaming
-@@ -977,21 +981,58 @@
- * only the %NL80211_ATTR_IE data is used and updated with this command.
+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
+ * %NL80211_ATTR_CONTROL_PORT_OVER_NL80211, %NL80211_ATTR_MAC_HINT, and
+@@ -571,6 +614,14 @@
+ * set of BSSID,frequency parameters is used (i.e., either the enforcing
+ * %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict
+ * %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT).
++ * Driver shall not modify the IEs specified through %NL80211_ATTR_IE if
++ * %NL80211_ATTR_MAC is included. However, if %NL80211_ATTR_MAC_HINT is
++ * included, these IEs through %NL80211_ATTR_IE are specified by the user
++ * space based on the best possible BSS selected. Thus, if the driver ends
++ * up selecting a different BSS, it can modify these IEs accordingly (e.g.
++ * userspace asks the driver to perform PMKSA caching with BSS1 and the
++ * driver ends up selecting BSS2 with different PMKSA cache entry; RSNIE
++ * has to get updated with the apt PMKID).
+ * %NL80211_ATTR_PREV_BSSID can be used to request a reassociation within
+ * the ESS in case the device is already associated and an association with
+ * a different BSS is desired.
+@@ -640,6 +691,10 @@
+ * four bytes for vendor frames including the OUI. The registration
+ * cannot be dropped, but is removed automatically when the netlink
+ * socket is closed. Multiple registrations can be made.
++ * The %NL80211_ATTR_RECEIVE_MULTICAST flag attribute can be given if
++ * %NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS is available, in which
++ * case the registration can also be modified to include/exclude the
++ * flag, rather than requiring unregistration to change it.
+ * @NL80211_CMD_REGISTER_ACTION: Alias for @NL80211_CMD_REGISTER_FRAME for
+ * backward compatibility
+ * @NL80211_CMD_FRAME: Management frame TX request and RX notification. This
+@@ -739,7 +794,7 @@
+ * various triggers. These triggers can be configured through this
+ * command with the %NL80211_ATTR_WOWLAN_TRIGGERS attribute. For
+ * more background information, see
+- * http://wireless.kernel.org/en/users/Documentation/WoWLAN.
++ * https://wireless.wiki.kernel.org/en/users/Documentation/WoWLAN.
+ * The @NL80211_CMD_SET_WOWLAN command can also be used as a notification
+ * from the driver reporting the wakeup reason. In this case, the
+ * @NL80211_ATTR_WOWLAN_TRIGGERS attribute will contain the reason
+@@ -1101,6 +1156,20 @@
+ * peer MAC address and %NL80211_ATTR_FRAME is used to specify the frame
+ * content. The frame is ethernet data.
*
- * @NL80211_CMD_SET_PMK: For offloaded 4-Way handshake, set the PMK or PMK-R0
-- * for the given authenticator address (specified with &NL80211_ATTR_MAC).
-- * When &NL80211_ATTR_PMKR0_NAME is set, &NL80211_ATTR_PMK specifies the
-+ * for the given authenticator address (specified with %NL80211_ATTR_MAC).
-+ * When %NL80211_ATTR_PMKR0_NAME is set, %NL80211_ATTR_PMK specifies the
- * PMK-R0, otherwise it specifies the PMK.
- * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously
- * configured PMK for the authenticator address identified by
-- * &NL80211_ATTR_MAC.
-+ * %NL80211_ATTR_MAC.
- * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates that the 4 way
- * handshake was completed successfully by the driver. The BSSID is
-- * specified with &NL80211_ATTR_MAC. Drivers that support 4 way handshake
-+ * specified with %NL80211_ATTR_MAC. Drivers that support 4 way handshake
- * offload should send this event after indicating 802.11 association with
-- * &NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed
-- * &NL80211_CMD_DISCONNECT should be indicated instead.
-+ * %NL80211_CMD_CONNECT or %NL80211_CMD_ROAM. If the 4 way handshake failed
-+ * %NL80211_CMD_DISCONNECT should be indicated instead.
-+ *
-+ * @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
-+ * has been received. %NL80211_ATTR_FRAME is used to specify the
-+ * frame contents. The frame is the raw EAPoL data, without ethernet or
-+ * 802.11 headers.
-+ * When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
-+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added
-+ * indicating the protocol type of the received frame; whether the frame
-+ * was received unencrypted and the MAC address of the peer respectively.
- *
- * @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded.
- *
-+ * @NL80211_CMD_EXTERNAL_AUTH: This interface is exclusively defined for host
-+ * drivers that do not define separate commands for authentication and
-+ * association, but rely on user space for the authentication to happen.
-+ * This interface acts both as the event request (driver to user space)
-+ * to trigger the authentication and command response (userspace to
-+ * driver) to indicate the authentication status.
-+ *
-+ * User space uses the %NL80211_CMD_CONNECT command to the host driver to
-+ * trigger a connection. The host driver selects a BSS and further uses
-+ * this interface to offload only the authentication part to the user
-+ * space. Authentication frames are passed between the driver and user
-+ * space through the %NL80211_CMD_FRAME interface. Host driver proceeds
-+ * further with the association after getting successful authentication
-+ * status. User space indicates the authentication status through
-+ * %NL80211_ATTR_STATUS_CODE attribute in %NL80211_CMD_EXTERNAL_AUTH
-+ * command interface.
-+ *
-+ * Host driver reports this status on an authentication failure to the
-+ * user space through the connect result as the user space would have
-+ * initiated the connection through the connect request.
-+ *
-+ * @NL80211_CMD_STA_OPMODE_CHANGED: An event that notify station's
-+ * ht opmode or vht opmode changes using any of %NL80211_ATTR_SMPS_MODE,
-+ * %NL80211_ATTR_CHANNEL_WIDTH,%NL80211_ATTR_NSS attributes with its
-+ * address(specified in %NL80211_ATTR_MAC).
++ * @NL80211_CMD_SET_TID_CONFIG: Data frame TID specific configuration
++ * is passed using %NL80211_ATTR_TID_CONFIG attribute.
++ *
++ * @NL80211_CMD_UNPROT_BEACON: Unprotected or incorrectly protected Beacon
++ * frame. This event is used to indicate that a received Beacon frame was
++ * dropped because it did not include a valid MME MIC while beacon
++ * protection was enabled (BIGTK configured in station mode).
++ *
++ * @NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS: Report TX status of a control
++ * port frame transmitted with %NL80211_CMD_CONTROL_PORT_FRAME.
++ * %NL80211_ATTR_COOKIE identifies the TX command and %NL80211_ATTR_FRAME
++ * includes the contents of the frame. %NL80211_ATTR_ACK flag is included
++ * if the recipient acknowledged the frame.
+ *
* @NL80211_CMD_MAX: highest used command number
* @__NL80211_CMD_AFTER_LAST: internal use
*/
-@@ -1198,6 +1239,12 @@ enum nl80211_commands {
+@@ -1325,6 +1394,12 @@ enum nl80211_commands {
- NL80211_CMD_RELOAD_REGDB,
+ NL80211_CMD_PROBE_MESH_LINK,
-+ NL80211_CMD_EXTERNAL_AUTH,
++ NL80211_CMD_SET_TID_CONFIG,
+
-+ NL80211_CMD_STA_OPMODE_CHANGED,
++ NL80211_CMD_UNPROT_BEACON,
+
-+ NL80211_CMD_CONTROL_PORT_FRAME,
++ NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS,
+
/* add new commands above here */
/* used to define NL80211_CMD_MAX below */
-@@ -1445,6 +1492,15 @@ enum nl80211_commands {
- * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
- * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
- * ethertype frames used for key negotiation must not be encrypted.
-+ * @NL80211_ATTR_CONTROL_PORT_OVER_NL80211: A flag indicating whether control
-+ * port frames (e.g. of type given in %NL80211_ATTR_CONTROL_PORT_ETHERTYPE)
-+ * will be sent directly to the network interface or sent via the NL80211
-+ * socket. If this attribute is missing, then legacy behavior of sending
-+ * control port frames directly to the network interface is used. If the
-+ * flag is included, then control port frames are sent over NL80211 instead
-+ * 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.
+@@ -1370,7 +1445,8 @@ enum nl80211_commands {
+ * of &enum nl80211_chan_width, describing the channel width. See the
+ * documentation of the enum for more information.
+ * @NL80211_ATTR_CENTER_FREQ1: Center frequency of the first part of the
+- * channel, used for anything but 20 MHz bandwidth
++ * channel, used for anything but 20 MHz bandwidth. In S1G this is the
++ * operating channel center frequency.
+ * @NL80211_ATTR_CENTER_FREQ2: Center frequency of the second part of the
+ * channel, used only for 80+80 MHz bandwidth
+ * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ
+@@ -1580,7 +1656,8 @@ enum nl80211_commands {
+ * flag is included, then control port frames are sent over NL80211 instead
+ * 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.
++ * flag. When used with %NL80211_ATTR_CONTROL_PORT_NO_PREAUTH, pre-auth
++ * frames are not forwared over the control port.
*
* @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
* We recommend using nested, driver-specific attributes within this.
-@@ -1932,6 +1988,12 @@ enum nl80211_commands {
- * multicast group.
- * If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the
- * station will deauthenticate when the socket is closed.
-+ * If set during %NL80211_CMD_JOIN_IBSS the IBSS will be automatically
-+ * torn down when the socket is closed.
-+ * If set during %NL80211_CMD_JOIN_MESH the mesh setup will be
-+ * automatically torn down when the socket is closed.
-+ * If set during %NL80211_CMD_START_AP the AP will be automatically
-+ * disabled when the socket is closed.
+@@ -2373,6 +2450,64 @@ enum nl80211_commands {
+ * the allowed channel bandwidth configurations. (u8 attribute)
+ * Defined by IEEE P802.11ay/D4.0 section 9.4.2.251, Table 13.
*
- * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
- * the TDLS link initiator.
-@@ -2153,6 +2215,35 @@ enum nl80211_commands {
- * @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.
- * @NL80211_ATTR_PORT_AUTHORIZED: (reserved)
- *
-+ * @NL80211_ATTR_EXTERNAL_AUTH_ACTION: Identify the requested external
-+ * authentication operation (u32 attribute with an
-+ * &enum nl80211_external_auth_action value). This is used with the
-+ * %NL80211_CMD_EXTERNAL_AUTH request event.
-+ * @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user
-+ * space supports external authentication. This attribute shall be used
-+ * only with %NL80211_CMD_CONNECT request. The driver may offload
-+ * authentication processing to user space if this capability is indicated
-+ * in NL80211_CMD_CONNECT requests from the user space.
-+ *
-+ * @NL80211_ATTR_NSS: Station's New/updated RX_NSS value notified using this
-+ * u8 attribute. This is used with %NL80211_CMD_STA_OPMODE_CHANGED.
-+ *
-+ * @NL80211_ATTR_TXQ_STATS: TXQ statistics (nested attribute, see &enum
-+ * nl80211_txq_stats)
-+ * @NL80211_ATTR_TXQ_LIMIT: Total packet limit for the TXQ queues for this phy.
-+ * The smaller of this and the memory limit is enforced.
-+ * @NL80211_ATTR_TXQ_MEMORY_LIMIT: Total memory memory limit (in bytes) for the
-+ * TXQ queues for this phy. The smaller of this and the packet limit is
-+ * enforced.
-+ * @NL80211_ATTR_TXQ_QUANTUM: TXQ scheduler quantum (bytes). Number of bytes
-+ * a flow is assigned on each round of the DRR scheduler.
-+ * @NL80211_ATTR_HE_CAPABILITY: HE Capability information element (from
-+ * association request when used with NL80211_CMD_NEW_STATION). Can be set
-+ * only if %NL80211_STA_FLAG_WME is set.
++ * @NL80211_ATTR_VLAN_ID: VLAN ID (1..4094) for the station and VLAN group key
++ * (u16).
++ *
++ * @NL80211_ATTR_HE_BSS_COLOR: nested attribute for BSS Color Settings.
++ *
++ * @NL80211_ATTR_IFTYPE_AKM_SUITES: nested array attribute, with each entry
++ * using attributes from &enum nl80211_iftype_akm_attributes. This
++ * attribute is sent in a response to %NL80211_CMD_GET_WIPHY indicating
++ * supported AKM suites capability per interface. AKMs advertised in
++ * %NL80211_ATTR_AKM_SUITES are default capabilities if AKM suites not
++ * advertised for a specific interface type.
++ *
++ * @NL80211_ATTR_TID_CONFIG: TID specific configuration in a
++ * nested attribute with &enum nl80211_tid_config_attr sub-attributes;
++ * on output (in wiphy attributes) it contains only the feature sub-
++ * attributes.
++ *
++ * @NL80211_ATTR_CONTROL_PORT_NO_PREAUTH: disable preauth frame rx on control
++ * port in order to forward/receive them as ordinary data frames.
++ *
++ * @NL80211_ATTR_PMK_LIFETIME: Maximum lifetime for PMKSA in seconds (u32,
++ * dot11RSNAConfigPMKReauthThreshold; 0 is not a valid value).
++ * An optional parameter configured through %NL80211_CMD_SET_PMKSA.
++ * Drivers that trigger roaming need to know the lifetime of the
++ * configured PMKSA for triggering the full vs. PMKSA caching based
++ * authentication. This timeout helps authentication methods like SAE,
++ * where PMK gets updated only by going through a full (new SAE)
++ * authentication instead of getting updated during an association for EAP
++ * authentication. No new full authentication within the PMK expiry shall
++ * result in a disassociation at the end of the lifetime.
++ *
++ * @NL80211_ATTR_PMK_REAUTH_THRESHOLD: Reauthentication threshold time, in
++ * terms of percentage of %NL80211_ATTR_PMK_LIFETIME
++ * (u8, dot11RSNAConfigPMKReauthThreshold, 1..100). This is an optional
++ * parameter configured through %NL80211_CMD_SET_PMKSA. Requests the
++ * driver to trigger a full authentication roam (without PMKSA caching)
++ * after the reauthentication threshold time, but before the PMK lifetime
++ * has expired.
++ *
++ * Authentication methods like SAE need to be able to generate a new PMKSA
++ * entry without having to force a disconnection after the PMK timeout. If
++ * no roaming occurs between the reauth threshold and PMK expiration,
++ * disassociation is still forced.
++ * @NL80211_ATTR_RECEIVE_MULTICAST: multicast flag for the
++ * %NL80211_CMD_REGISTER_FRAME command, see the description there.
++ * @NL80211_ATTR_WIPHY_FREQ_OFFSET: offset of the associated
++ * %NL80211_ATTR_WIPHY_FREQ in positive KHz. Only valid when supplied with
++ * an %NL80211_ATTR_WIPHY_FREQ_OFFSET.
++ * @NL80211_ATTR_CENTER_FREQ1_OFFSET: Center frequency offset in KHz for the
++ * first channel segment specified in %NL80211_ATTR_CENTER_FREQ1.
++ * @NL80211_ATTR_SCAN_FREQ_KHZ: nested attribute with KHz frequencies
++ *
++ * @NL80211_ATTR_HE_6GHZ_CAPABILITY: HE 6 GHz Band Capability element (from
++ * association request when used with NL80211_CMD_NEW_STATION).
+ *
+ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
+ * transmit power to stay within regulatory limits. u32, dBi.
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
-@@ -2579,6 +2670,23 @@ enum nl80211_attrs {
- NL80211_ATTR_PMKR0_NAME,
- NL80211_ATTR_PORT_AUTHORIZED,
+@@ -2835,6 +2970,28 @@ enum nl80211_attrs {
+ NL80211_ATTR_WIPHY_EDMG_CHANNELS,
+ NL80211_ATTR_WIPHY_EDMG_BW_CONFIG,
-+ NL80211_ATTR_EXTERNAL_AUTH_ACTION,
-+ NL80211_ATTR_EXTERNAL_AUTH_SUPPORT,
++ NL80211_ATTR_VLAN_ID,
++
++ NL80211_ATTR_HE_BSS_COLOR,
+
-+ NL80211_ATTR_NSS,
-+ NL80211_ATTR_ACK_SIGNAL,
++ NL80211_ATTR_IFTYPE_AKM_SUITES,
+
-+ NL80211_ATTR_CONTROL_PORT_OVER_NL80211,
++ NL80211_ATTR_TID_CONFIG,
+
-+ NL80211_ATTR_TXQ_STATS,
-+ NL80211_ATTR_TXQ_LIMIT,
-+ NL80211_ATTR_TXQ_MEMORY_LIMIT,
-+ NL80211_ATTR_TXQ_QUANTUM,
++ NL80211_ATTR_CONTROL_PORT_NO_PREAUTH,
+
-+ NL80211_ATTR_HE_CAPABILITY,
++ NL80211_ATTR_PMK_LIFETIME,
++ NL80211_ATTR_PMK_REAUTH_THRESHOLD,
++
++ NL80211_ATTR_RECEIVE_MULTICAST,
++ NL80211_ATTR_WIPHY_FREQ_OFFSET,
++ NL80211_ATTR_CENTER_FREQ1_OFFSET,
++ NL80211_ATTR_SCAN_FREQ_KHZ,
++
++ NL80211_ATTR_HE_6GHZ_CAPABILITY,
+
+ NL80211_ATTR_WIPHY_ANTENNA_GAIN,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
-@@ -2618,6 +2726,8 @@ enum nl80211_attrs {
- #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
- #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
-
-+#define NL80211_WIPHY_NAME_MAXLEN 64
-+
- #define NL80211_MAX_SUPP_RATES 32
- #define NL80211_MAX_SUPP_HT_RATES 77
- #define NL80211_MAX_SUPP_REG_RULES 64
-@@ -2626,7 +2736,8 @@ enum nl80211_attrs {
- #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24
- #define NL80211_HT_CAPABILITY_LEN 26
- #define NL80211_VHT_CAPABILITY_LEN 12
--
-+#define NL80211_HE_MIN_CAPABILITY_LEN 16
-+#define NL80211_HE_MAX_CAPABILITY_LEN 51
- #define NL80211_MAX_NR_CIPHER_SUITES 5
- #define NL80211_MAX_NR_AKM_SUITES 2
+@@ -3413,6 +3570,8 @@ enum nl80211_mpath_info {
+ * defined in HE capabilities IE
+ * @NL80211_BAND_IFTYPE_ATTR_MAX: highest band HE capability attribute currently
+ * defined
++ * @NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA: HE 6GHz band capabilities (__le16),
++ * given for all 6 GHz band channels
+ * @__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST: internal use
+ */
+ enum nl80211_band_iftype_attr {
+@@ -3423,6 +3582,7 @@ enum nl80211_band_iftype_attr {
+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY,
+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET,
+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE,
++ NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA,
-@@ -2754,6 +2865,38 @@ struct nl80211_sta_flag_update {
- } __attribute__((packed));
+ /* keep last */
+ __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST,
+@@ -3554,6 +3714,9 @@ enum nl80211_wmm_rule {
+ * @NL80211_FREQUENCY_ATTR_WMM: this channel has wmm limitations.
+ * This is a nested attribute that contains the wmm limitation per AC.
+ * (see &enum nl80211_wmm_rule)
++ * @NL80211_FREQUENCY_ATTR_NO_HE: HE operation is not allowed on this channel
++ * in current regulatory domain.
++ * @NL80211_FREQUENCY_ATTR_OFFSET: frequency offset in KHz
+ * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
+ * currently defined
+ * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
+@@ -3583,6 +3746,8 @@ enum nl80211_frequency_attr {
+ NL80211_FREQUENCY_ATTR_NO_20MHZ,
+ NL80211_FREQUENCY_ATTR_NO_10MHZ,
+ NL80211_FREQUENCY_ATTR_WMM,
++ NL80211_FREQUENCY_ATTR_NO_HE,
++ NL80211_FREQUENCY_ATTR_OFFSET,
- /**
-+ * enum nl80211_he_gi - HE guard interval
-+ * @NL80211_RATE_INFO_HE_GI_0_8: 0.8 usec
-+ * @NL80211_RATE_INFO_HE_GI_1_6: 1.6 usec
-+ * @NL80211_RATE_INFO_HE_GI_3_2: 3.2 usec
-+ */
-+enum nl80211_he_gi {
-+ NL80211_RATE_INFO_HE_GI_0_8,
-+ NL80211_RATE_INFO_HE_GI_1_6,
-+ NL80211_RATE_INFO_HE_GI_3_2,
-+};
-+
-+/**
-+ * enum nl80211_he_ru_alloc - HE RU allocation values
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_26: 26-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_52: 52-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_106: 106-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_242: 242-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_484: 484-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_996: 996-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_2x996: 2x996-tone RU allocation
-+ */
-+enum nl80211_he_ru_alloc {
-+ NL80211_RATE_INFO_HE_RU_ALLOC_26,
-+ NL80211_RATE_INFO_HE_RU_ALLOC_52,
-+ NL80211_RATE_INFO_HE_RU_ALLOC_106,
-+ NL80211_RATE_INFO_HE_RU_ALLOC_242,
-+ NL80211_RATE_INFO_HE_RU_ALLOC_484,
-+ NL80211_RATE_INFO_HE_RU_ALLOC_996,
-+ NL80211_RATE_INFO_HE_RU_ALLOC_2x996,
-+};
-+
-+/**
- * enum nl80211_rate_info - bitrate information
- *
- * These attribute types are used with %NL80211_STA_INFO_TXRATE
-@@ -2785,6 +2928,13 @@ struct nl80211_sta_flag_update {
- * @NL80211_RATE_INFO_5_MHZ_WIDTH: 5 MHz width - note that this is
- * a legacy rate and will be reported as the actual bitrate, i.e.
- * a quarter of the base (20 MHz) rate
-+ * @NL80211_RATE_INFO_HE_MCS: HE MCS index (u8, 0-11)
-+ * @NL80211_RATE_INFO_HE_NSS: HE NSS value (u8, 1-8)
-+ * @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
-+ * non-OFDMA was used (u8, see &enum nl80211_he_ru_alloc)
- * @__NL80211_RATE_INFO_AFTER_LAST: internal use
+ /* keep last */
+ __NL80211_FREQUENCY_ATTR_AFTER_LAST,
+@@ -3780,6 +3945,7 @@ enum nl80211_sched_scan_match_attr {
+ * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation
+ * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed
+ * @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed
++ * @NL80211_RRF_NO_HE: HE operation not allowed
*/
- enum nl80211_rate_info {
-@@ -2801,6 +2951,11 @@ enum nl80211_rate_info {
- NL80211_RATE_INFO_160_MHZ_WIDTH,
- NL80211_RATE_INFO_10_MHZ_WIDTH,
- NL80211_RATE_INFO_5_MHZ_WIDTH,
-+ NL80211_RATE_INFO_HE_MCS,
-+ NL80211_RATE_INFO_HE_NSS,
-+ NL80211_RATE_INFO_HE_GI,
-+ NL80211_RATE_INFO_HE_DCM,
-+ NL80211_RATE_INFO_HE_RU_ALLOC,
+ enum nl80211_reg_rule_flags {
+ NL80211_RRF_NO_OFDM = 1<<0,
+@@ -3797,6 +3963,7 @@ enum nl80211_reg_rule_flags {
+ NL80211_RRF_NO_HT40PLUS = 1<<14,
+ NL80211_RRF_NO_80MHZ = 1<<15,
+ NL80211_RRF_NO_160MHZ = 1<<16,
++ NL80211_RRF_NO_HE = 1<<17,
+ };
- /* keep last */
- __NL80211_RATE_INFO_AFTER_LAST,
-@@ -2899,6 +3054,9 @@ enum nl80211_sta_bss_param {
- * @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames
- * received from the station (u64, usec)
- * @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
-+ * @NL80211_STA_INFO_ACK_SIGNAL: signal strength of the last ACK frame(u8, dBm)
-+ * @NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG: avg signal strength of (data)
-+ * ACK frame (s8, dBm)
- * @__NL80211_STA_INFO_AFTER_LAST: internal
- * @NL80211_STA_INFO_MAX: highest possible station info attribute
+ #define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
+@@ -4351,6 +4518,7 @@ enum nl80211_bss_scan_width {
+ * @NL80211_BSS_CHAIN_SIGNAL: per-chain signal strength of last BSS update.
+ * Contains a nested array of signal strength attributes (u8, dBm),
+ * using the nesting index as the antenna number.
++ * @NL80211_BSS_FREQUENCY_OFFSET: frequency offset in KHz
+ * @__NL80211_BSS_AFTER_LAST: internal
+ * @NL80211_BSS_MAX: highest BSS attribute
*/
-@@ -2937,6 +3095,8 @@ enum nl80211_sta_info {
- NL80211_STA_INFO_TID_STATS,
- NL80211_STA_INFO_RX_DURATION,
- NL80211_STA_INFO_PAD,
-+ NL80211_STA_INFO_ACK_SIGNAL,
-+ NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG,
+@@ -4375,6 +4543,7 @@ enum nl80211_bss {
+ NL80211_BSS_PARENT_TSF,
+ NL80211_BSS_PARENT_BSSID,
+ NL80211_BSS_CHAIN_SIGNAL,
++ NL80211_BSS_FREQUENCY_OFFSET,
/* keep last */
- __NL80211_STA_INFO_AFTER_LAST,
-@@ -2954,6 +3114,7 @@ enum nl80211_sta_info {
- * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
- * MSDUs (u64)
- * @NL80211_TID_STATS_PAD: attribute used for padding for 64-bit alignment
-+ * @NL80211_TID_STATS_TXQ_STATS: TXQ stats (nested attribute)
- * @NUM_NL80211_TID_STATS: number of attributes here
- * @NL80211_TID_STATS_MAX: highest numbered attribute here
- */
-@@ -2964,6 +3125,7 @@ enum nl80211_tid_stats {
- NL80211_TID_STATS_TX_MSDU_RETRIES,
- NL80211_TID_STATS_TX_MSDU_FAILED,
- NL80211_TID_STATS_PAD,
-+ NL80211_TID_STATS_TXQ_STATS,
+ __NL80211_BSS_AFTER_LAST,
+@@ -4503,6 +4672,7 @@ enum nl80211_key_default_types {
+ * See &enum nl80211_key_default_types.
+ * @NL80211_KEY_MODE: the mode from enum nl80211_key_mode.
+ * Defaults to @NL80211_KEY_RX_TX.
++ * @NL80211_KEY_DEFAULT_BEACON: flag indicating default Beacon frame key
+ *
+ * @__NL80211_KEY_AFTER_LAST: internal
+ * @NL80211_KEY_MAX: highest key attribute
+@@ -4518,6 +4688,7 @@ enum nl80211_key_attributes {
+ NL80211_KEY_TYPE,
+ NL80211_KEY_DEFAULT_TYPES,
+ NL80211_KEY_MODE,
++ NL80211_KEY_DEFAULT_BEACON,
/* keep last */
- NUM_NL80211_TID_STATS,
-@@ -2971,6 +3133,44 @@ enum nl80211_tid_stats {
+ __NL80211_KEY_AFTER_LAST,
+@@ -4674,6 +4845,92 @@ enum nl80211_tx_power_setting {
};
/**
-+ * enum nl80211_txq_stats - per TXQ statistics attributes
-+ * @__NL80211_TXQ_STATS_INVALID: attribute number 0 is reserved
-+ * @NUM_NL80211_TXQ_STATS: number of attributes here
-+ * @NL80211_TXQ_STATS_BACKLOG_BYTES: number of bytes currently backlogged
-+ * @NL80211_TXQ_STATS_BACKLOG_PACKETS: number of packets currently
-+ * backlogged
-+ * @NL80211_TXQ_STATS_FLOWS: total number of new flows seen
-+ * @NL80211_TXQ_STATS_DROPS: total number of packet drops
-+ * @NL80211_TXQ_STATS_ECN_MARKS: total number of packet ECN marks
-+ * @NL80211_TXQ_STATS_OVERLIMIT: number of drops due to queue space overflow
-+ * @NL80211_TXQ_STATS_OVERMEMORY: number of drops due to memory limit overflow
-+ * (only for per-phy stats)
-+ * @NL80211_TXQ_STATS_COLLISIONS: number of hash collisions
-+ * @NL80211_TXQ_STATS_TX_BYTES: total number of bytes dequeued from TXQ
-+ * @NL80211_TXQ_STATS_TX_PACKETS: total number of packets dequeued from TXQ
-+ * @NL80211_TXQ_STATS_MAX_FLOWS: number of flow buckets for PHY
-+ * @NL80211_TXQ_STATS_MAX: highest numbered attribute here
++ * enum nl80211_tid_config - TID config state
++ * @NL80211_TID_CONFIG_ENABLE: Enable config for the TID
++ * @NL80211_TID_CONFIG_DISABLE: Disable config for the TID
+ */
-+enum nl80211_txq_stats {
-+ __NL80211_TXQ_STATS_INVALID,
-+ NL80211_TXQ_STATS_BACKLOG_BYTES,
-+ NL80211_TXQ_STATS_BACKLOG_PACKETS,
-+ NL80211_TXQ_STATS_FLOWS,
-+ NL80211_TXQ_STATS_DROPS,
-+ NL80211_TXQ_STATS_ECN_MARKS,
-+ NL80211_TXQ_STATS_OVERLIMIT,
-+ NL80211_TXQ_STATS_OVERMEMORY,
-+ NL80211_TXQ_STATS_COLLISIONS,
-+ NL80211_TXQ_STATS_TX_BYTES,
-+ NL80211_TXQ_STATS_TX_PACKETS,
-+ NL80211_TXQ_STATS_MAX_FLOWS,
-+
-+ /* keep last */
-+ NUM_NL80211_TXQ_STATS,
-+ NL80211_TXQ_STATS_MAX = NUM_NL80211_TXQ_STATS - 1
++enum nl80211_tid_config {
++ NL80211_TID_CONFIG_ENABLE,
++ NL80211_TID_CONFIG_DISABLE,
+};
+
-+/**
- * enum nl80211_mpath_flags - nl80211 mesh path flags
- *
- * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
-@@ -3022,6 +3222,38 @@ enum nl80211_mpath_info {
- };
-
- /**
-+ * enum nl80211_band_iftype_attr - Interface type data attributes
-+ *
-+ * @__NL80211_BAND_IFTYPE_ATTR_INVALID: attribute number 0 is reserved
-+ * @NL80211_BAND_IFTYPE_ATTR_IFTYPES: nested attribute containing a flag attribute
-+ * for each interface type that supports the band data
-+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC: HE MAC capabilities as in HE
-+ * capabilities IE
-+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY: HE PHY capabilities as in HE
-+ * capabilities IE
-+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET: HE supported NSS/MCS as in HE
-+ * capabilities IE
-+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE: HE PPE thresholds information as
-+ * defined in HE capabilities IE
-+ * @NL80211_BAND_IFTYPE_ATTR_MAX: highest band HE capability attribute currently
-+ * defined
-+ * @__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST: internal use
++/* enum nl80211_tx_rate_setting - TX rate configuration type
++ * @NL80211_TX_RATE_AUTOMATIC: automatically determine TX rate
++ * @NL80211_TX_RATE_LIMITED: limit the TX rate by the TX rate parameter
++ * @NL80211_TX_RATE_FIXED: fix TX rate to the TX rate parameter
+ */
-+enum nl80211_band_iftype_attr {
-+ __NL80211_BAND_IFTYPE_ATTR_INVALID,
++enum nl80211_tx_rate_setting {
++ NL80211_TX_RATE_AUTOMATIC,
++ NL80211_TX_RATE_LIMITED,
++ NL80211_TX_RATE_FIXED,
++};
+
-+ NL80211_BAND_IFTYPE_ATTR_IFTYPES,
-+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC,
-+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY,
-+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET,
-+ NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE,
++/* enum nl80211_tid_config_attr - TID specific configuration.
++ * @NL80211_TID_CONFIG_ATTR_PAD: pad attribute for 64-bit values
++ * @NL80211_TID_CONFIG_ATTR_VIF_SUPP: a bitmap (u64) of attributes supported
++ * for per-vif configuration; doesn't list the ones that are generic
++ * (%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
++ * that the new configuration overrides all previous peer
++ * configurations, otherwise previous peer specific configurations
++ * should be left untouched.
++ * @NL80211_TID_CONFIG_ATTR_TIDS: a bitmask value of TIDs (bit 0 to 7)
++ * Its type is u16.
++ * @NL80211_TID_CONFIG_ATTR_NOACK: Configure ack policy for the TID.
++ * specified in %NL80211_TID_CONFIG_ATTR_TID. see %enum nl80211_tid_config.
++ * Its type is u8.
++ * @NL80211_TID_CONFIG_ATTR_RETRY_SHORT: Number of retries used with data frame
++ * transmission, user-space sets this configuration in
++ * &NL80211_CMD_SET_TID_CONFIG. It is u8 type, min value is 1 and
++ * the max value is advertised by the driver in this attribute on
++ * output in wiphy capabilities.
++ * @NL80211_TID_CONFIG_ATTR_RETRY_LONG: Number of retries used with data frame
++ * transmission, user-space sets this configuration in
++ * &NL80211_CMD_SET_TID_CONFIG. Its type is u8, min value is 1 and
++ * the max value is advertised by the driver in this attribute on
++ * output in wiphy capabilities.
++ * @NL80211_TID_CONFIG_ATTR_AMPDU_CTRL: Enable/Disable MPDU aggregation
++ * for the TIDs specified in %NL80211_TID_CONFIG_ATTR_TIDS.
++ * Its type is u8, using the values from &nl80211_tid_config.
++ * @NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL: Enable/Disable RTS_CTS for the TIDs
++ * specified in %NL80211_TID_CONFIG_ATTR_TIDS. It is u8 type, using
++ * the values from &nl80211_tid_config.
++ * @NL80211_TID_CONFIG_ATTR_AMSDU_CTRL: Enable/Disable MSDU aggregation
++ * for the TIDs specified in %NL80211_TID_CONFIG_ATTR_TIDS.
++ * Its type is u8, using the values from &nl80211_tid_config.
++ * @NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE: This attribute will be useful
++ * to notfiy the driver that what type of txrate should be used
++ * for the TIDs specified in %NL80211_TID_CONFIG_ATTR_TIDS. using
++ * the values form &nl80211_tx_rate_setting.
++ * @NL80211_TID_CONFIG_ATTR_TX_RATE: Data frame TX rate mask should be applied
++ * with the parameters passed through %NL80211_ATTR_TX_RATES.
++ * configuration is applied to the data frame for the tid to that connected
++ * station.
++ */
++enum nl80211_tid_config_attr {
++ __NL80211_TID_CONFIG_ATTR_INVALID,
++ NL80211_TID_CONFIG_ATTR_PAD,
++ NL80211_TID_CONFIG_ATTR_VIF_SUPP,
++ NL80211_TID_CONFIG_ATTR_PEER_SUPP,
++ NL80211_TID_CONFIG_ATTR_OVERRIDE,
++ NL80211_TID_CONFIG_ATTR_TIDS,
++ NL80211_TID_CONFIG_ATTR_NOACK,
++ NL80211_TID_CONFIG_ATTR_RETRY_SHORT,
++ NL80211_TID_CONFIG_ATTR_RETRY_LONG,
++ NL80211_TID_CONFIG_ATTR_AMPDU_CTRL,
++ NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL,
++ NL80211_TID_CONFIG_ATTR_AMSDU_CTRL,
++ NL80211_TID_CONFIG_ATTR_TX_RATE_TYPE,
++ NL80211_TID_CONFIG_ATTR_TX_RATE,
+
+ /* keep last */
-+ __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST,
-+ NL80211_BAND_IFTYPE_ATTR_MAX = __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST - 1
++ __NL80211_TID_CONFIG_ATTR_AFTER_LAST,
++ NL80211_TID_CONFIG_ATTR_MAX = __NL80211_TID_CONFIG_ATTR_AFTER_LAST - 1
+};
+
+/**
- * enum nl80211_band_attr - band attributes
- * @__NL80211_BAND_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_BAND_ATTR_FREQS: supported frequencies in this band,
-@@ -3036,6 +3268,8 @@ enum nl80211_mpath_info {
- * @NL80211_BAND_ATTR_VHT_MCS_SET: 32-byte attribute containing the MCS set as
- * defined in 802.11ac
- * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE
-+ * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each entry using
-+ * attributes from &enum nl80211_band_iftype_attr
- * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined
- * @__NL80211_BAND_ATTR_AFTER_LAST: internal use
- */
-@@ -3051,6 +3285,7 @@ enum nl80211_band_attr {
+ * enum nl80211_packet_pattern_attr - packet pattern attribute
+ * @__NL80211_PKTPAT_INVALID: invalid number for nested attribute
+ * @NL80211_PKTPAT_PATTERN: the pattern, values where the mask has
+@@ -5144,6 +5401,8 @@ enum plink_actions {
- NL80211_BAND_ATTR_VHT_MCS_SET,
- NL80211_BAND_ATTR_VHT_CAPA,
-+ NL80211_BAND_ATTR_IFTYPE_DATA,
-
- /* keep last */
- __NL80211_BAND_ATTR_AFTER_LAST,
-@@ -3060,6 +3295,29 @@ enum nl80211_band_attr {
- #define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
+ #define NL80211_KCK_LEN 16
+ #define NL80211_KEK_LEN 16
++#define NL80211_KCK_EXT_LEN 24
++#define NL80211_KEK_EXT_LEN 32
+ #define NL80211_REPLAY_CTR_LEN 8
/**
-+ * enum nl80211_wmm_rule - regulatory wmm rule
-+ *
-+ * @__NL80211_WMMR_INVALID: attribute number 0 is reserved
-+ * @NL80211_WMMR_CW_MIN: Minimum contention window slot.
-+ * @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_LAST: Internal use.
-+ */
-+enum nl80211_wmm_rule {
-+ __NL80211_WMMR_INVALID,
-+ NL80211_WMMR_CW_MIN,
-+ NL80211_WMMR_CW_MAX,
-+ NL80211_WMMR_AIFSN,
-+ NL80211_WMMR_TXOP,
-+
-+ /* keep last */
-+ __NL80211_WMMR_LAST,
-+ NL80211_WMMR_MAX = __NL80211_WMMR_LAST - 1
-+};
-+
-+/**
- * enum nl80211_frequency_attr - frequency attributes
- * @__NL80211_FREQUENCY_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
-@@ -3108,6 +3366,9 @@ enum nl80211_band_attr {
- * on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_NO_10MHZ: 10 MHz operation is not allowed
- * on this channel in current regulatory domain.
-+ * @NL80211_FREQUENCY_ATTR_WMM: this channel has wmm limitations.
-+ * This is a nested attribute that contains the wmm limitation per AC.
-+ * (see &enum nl80211_wmm_rule)
- * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
- * currently defined
- * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
-@@ -3136,6 +3397,7 @@ enum nl80211_frequency_attr {
- NL80211_FREQUENCY_ATTR_IR_CONCURRENT,
- NL80211_FREQUENCY_ATTR_NO_20MHZ,
- NL80211_FREQUENCY_ATTR_NO_10MHZ,
-+ NL80211_FREQUENCY_ATTR_WMM,
+@@ -5152,6 +5411,7 @@ enum plink_actions {
+ * @NL80211_REKEY_DATA_KEK: key encryption key (binary)
+ * @NL80211_REKEY_DATA_KCK: key confirmation key (binary)
+ * @NL80211_REKEY_DATA_REPLAY_CTR: replay counter (binary)
++ * @NL80211_REKEY_DATA_AKM: AKM data (OUI, suite type)
+ * @NUM_NL80211_REKEY_DATA: number of rekey attributes (internal)
+ * @MAX_NL80211_REKEY_DATA: highest rekey attribute (internal)
+ */
+@@ -5160,6 +5420,7 @@ enum nl80211_rekey_data {
+ NL80211_REKEY_DATA_KEK,
+ NL80211_REKEY_DATA_KCK,
+ NL80211_REKEY_DATA_REPLAY_CTR,
++ NL80211_REKEY_DATA_AKM,
/* keep last */
- __NL80211_FREQUENCY_ATTR_AFTER_LAST,
-@@ -3319,7 +3581,7 @@ enum nl80211_sched_scan_match_attr {
- * @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.
-- * @NL80211_RRF_IR_CONCURRENT: See &NL80211_FREQUENCY_ATTR_IR_CONCURRENT
-+ * @NL80211_RRF_IR_CONCURRENT: See %NL80211_FREQUENCY_ATTR_IR_CONCURRENT
- * @NL80211_RRF_NO_HT40MINUS: channels can't be used in HT40- operation
- * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation
- * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed
-@@ -4945,6 +5207,27 @@ enum nl80211_feature_flags {
- * probe request tx deferral and suppression
- * @NL80211_EXT_FEATURE_MFP_OPTIONAL: Driver supports the %NL80211_MFP_OPTIONAL
- * value in %NL80211_ATTR_USE_MFP.
-+ * @NL80211_EXT_FEATURE_LOW_SPAN_SCAN: Driver supports low span scan.
-+ * @NL80211_EXT_FEATURE_LOW_POWER_SCAN: Driver supports low power scan.
-+ * @NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN: Driver supports high accuracy scan.
-+ * @NL80211_EXT_FEATURE_DFS_OFFLOAD: HW/driver will offload DFS actions.
-+ * Device or driver will do all DFS-related actions by itself,
-+ * informing user-space about CAC progress, radar detection event,
-+ * channel change triggered by radar detection event.
-+ * No need to start CAC from user-space, no need to react to
-+ * "radar detected" event.
-+ * @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211: Driver supports sending and
-+ * receiving control port frames over nl80211 instead of the netdevice.
-+ * @NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT: This Driver support data ack
-+ * rssi if firmware support, this flag is to intimate about ack rssi
-+ * support to nl80211.
-+ * @NL80211_EXT_FEATURE_TXQS: Driver supports FQ-CoDel-enabled intermediate
-+ * TXQs.
-+ * @NL80211_EXT_FEATURE_SCAN_RANDOM_SN: Driver/device supports randomizing the
-+ * SN in probe request frames if requested by %NL80211_SCAN_FLAG_RANDOM_SN.
-+ * @NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT: Driver/device can omit all data
-+ * except for supported rates from the probe request content if requested
-+ * by the %NL80211_SCAN_FLAG_MIN_PREQ_CONTENT flag.
+ NUM_NL80211_REKEY_DATA,
+@@ -5484,6 +5745,39 @@ enum nl80211_feature_flags {
+ * @NL80211_EXT_FEATURE_SAE_OFFLOAD: Device wants to do SAE authentication in
+ * station mode (SAE password is passed as part of the connect command).
*
++ * @NL80211_EXT_FEATURE_VLAN_OFFLOAD: The driver supports a single netdev
++ * with VLAN tagged frames and separate VLAN-specific netdevs added using
++ * vconfig similarly to the Ethernet case.
++ *
++ * @NL80211_EXT_FEATURE_AQL: The driver supports the Airtime Queue Limit (AQL)
++ * feature, which prevents bufferbloat by using the expected transmission
++ * time to limit the amount of data buffered in the hardware.
++ *
++ * @NL80211_EXT_FEATURE_BEACON_PROTECTION: The driver supports Beacon protection
++ * and can receive key configuration for BIGTK using key indexes 6 and 7.
++ * @NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT: The driver supports Beacon
++ * protection as a client only and cannot transmit protected beacons.
++ *
++ * @NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH: The driver can disable the
++ * forwarding of preauth frames over the control port. They are then
++ * handled as ordinary data frames.
++ *
++ * @NL80211_EXT_FEATURE_PROTECTED_TWT: Driver supports protected TWT frames
++ *
++ * @NL80211_EXT_FEATURE_DEL_IBSS_STA: The driver supports removing stations
++ * in IBSS mode, essentially by dropping their state.
++ *
++ * @NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS: management frame registrations
++ * are possible for multicast frames and those will be reported properly.
++ *
++ * @NL80211_EXT_FEATURE_SCAN_FREQ_KHZ: This driver supports receiving and
++ * reporting scan request with %NL80211_ATTR_SCAN_FREQ_KHZ. In order to
++ * report %NL80211_ATTR_SCAN_FREQ_KHZ, %NL80211_SCAN_FLAG_FREQ_KHZ must be
++ * included in the scan request.
++ *
++ * @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS: The driver
++ * can report tx status for control port over nl80211 tx operations.
++ *
* @NUM_NL80211_EXT_FEATURES: number of extended features.
* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
-@@ -4972,6 +5255,15 @@ enum nl80211_ext_feature_index {
- NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE,
- NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION,
- NL80211_EXT_FEATURE_MFP_OPTIONAL,
-+ NL80211_EXT_FEATURE_LOW_SPAN_SCAN,
-+ NL80211_EXT_FEATURE_LOW_POWER_SCAN,
-+ NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN,
-+ NL80211_EXT_FEATURE_DFS_OFFLOAD,
-+ NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211,
-+ NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT,
-+ NL80211_EXT_FEATURE_TXQS,
-+ NL80211_EXT_FEATURE_SCAN_RANDOM_SN,
-+ NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,
+ */
+@@ -5529,6 +5823,16 @@ enum nl80211_ext_feature_index {
+ NL80211_EXT_FEATURE_EXT_KEY_ID,
+ NL80211_EXT_FEATURE_STA_TX_PWR,
+ NL80211_EXT_FEATURE_SAE_OFFLOAD,
++ NL80211_EXT_FEATURE_VLAN_OFFLOAD,
++ NL80211_EXT_FEATURE_AQL,
++ NL80211_EXT_FEATURE_BEACON_PROTECTION,
++ NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH,
++ NL80211_EXT_FEATURE_PROTECTED_TWT,
++ NL80211_EXT_FEATURE_DEL_IBSS_STA,
++ NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS,
++ NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT,
++ NL80211_EXT_FEATURE_SCAN_FREQ_KHZ,
++ NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS,
/* add new features before the definition below */
NUM_NL80211_EXT_FEATURES,
-@@ -5032,6 +5324,10 @@ enum nl80211_timeout_reason {
- * of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN
- * requests.
- *
-+ * NL80211_SCAN_FLAG_LOW_SPAN, NL80211_SCAN_FLAG_LOW_POWER, and
-+ * NL80211_SCAN_FLAG_HIGH_ACCURACY flags are exclusive of each other, i.e., only
-+ * one of them can be used in the request.
-+ *
- * @NL80211_SCAN_FLAG_LOW_PRIORITY: scan request has low priority
- * @NL80211_SCAN_FLAG_FLUSH: flush cache before scanning
- * @NL80211_SCAN_FLAG_AP: force a scan even if the interface is configured
-@@ -5059,7 +5355,26 @@ enum nl80211_timeout_reason {
- * and suppression (if it has received a broadcast Probe Response frame,
- * Beacon frame or FILS Discovery frame from an AP that the STA considers
- * a suitable candidate for (re-)association - suitable in terms of
-- * SSID and/or RSSI
-+ * SSID and/or RSSI.
-+ * @NL80211_SCAN_FLAG_LOW_SPAN: Span corresponds to the total time taken to
-+ * accomplish the scan. Thus, this flag intends the driver to perform the
-+ * scan request with lesser span/duration. It is specific to the driver
-+ * implementations on how this is accomplished. Scan accuracy may get
-+ * impacted with this flag.
-+ * @NL80211_SCAN_FLAG_LOW_POWER: This flag intends the scan attempts to consume
-+ * optimal possible power. Drivers can resort to their specific means to
-+ * optimize the power. Scan accuracy may get impacted with this flag.
-+ * @NL80211_SCAN_FLAG_HIGH_ACCURACY: Accuracy here intends to the extent of scan
-+ * results obtained. Thus HIGH_ACCURACY scan flag aims to get maximum
-+ * possible scan results. This flag hints the driver to use the best
-+ * possible scan configuration to improve the accuracy in scanning.
-+ * Latency and power use may get impacted with this flag.
-+ * @NL80211_SCAN_FLAG_RANDOM_SN: randomize the sequence number in probe
-+ * request frames from this scan to avoid correlation/tracking being
-+ * possible.
-+ * @NL80211_SCAN_FLAG_MIN_PREQ_CONTENT: minimize probe request content to
-+ * only have supported rates and no additional capabilities (unless
-+ * added by userspace explicitly.)
+@@ -5640,6 +5944,9 @@ enum nl80211_timeout_reason {
+ * @NL80211_SCAN_FLAG_MIN_PREQ_CONTENT: minimize probe request content to
+ * only have supported rates and no additional capabilities (unless
+ * added by userspace explicitly.)
++ * @NL80211_SCAN_FLAG_FREQ_KHZ: report scan results with
++ * %NL80211_ATTR_SCAN_FREQ_KHZ. This also means
++ * %NL80211_ATTR_SCAN_FREQUENCIES will not be included.
*/
enum nl80211_scan_flags {
NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0,
-@@ -5070,6 +5385,11 @@ enum nl80211_scan_flags {
- NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP = 1<<5,
- NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE = 1<<6,
- NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 1<<7,
-+ NL80211_SCAN_FLAG_LOW_SPAN = 1<<8,
-+ NL80211_SCAN_FLAG_LOW_POWER = 1<<9,
-+ NL80211_SCAN_FLAG_HIGH_ACCURACY = 1<<10,
-+ NL80211_SCAN_FLAG_RANDOM_SN = 1<<11,
-+ NL80211_SCAN_FLAG_MIN_PREQ_CONTENT = 1<<12,
+@@ -5655,6 +5962,7 @@ enum nl80211_scan_flags {
+ NL80211_SCAN_FLAG_HIGH_ACCURACY = 1<<10,
+ NL80211_SCAN_FLAG_RANDOM_SN = 1<<11,
+ NL80211_SCAN_FLAG_MIN_PREQ_CONTENT = 1<<12,
++ NL80211_SCAN_FLAG_FREQ_KHZ = 1<<13,
};
/**
-@@ -5127,6 +5447,8 @@ enum nl80211_smps_mode {
- * non-operating channel is expired and no longer valid. New CAC must
- * be done on this channel before starting the operation. This is not
- * 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.
+@@ -6151,12 +6459,14 @@ enum nl80211_ftm_responder_stats {
+ * @NL80211_PREAMBLE_HT: HT preamble
+ * @NL80211_PREAMBLE_VHT: VHT preamble
+ * @NL80211_PREAMBLE_DMG: DMG preamble
++ * @NL80211_PREAMBLE_HE: HE preamble
*/
- enum nl80211_radar_event {
- NL80211_RADAR_DETECTED,
-@@ -5134,6 +5456,7 @@ enum nl80211_radar_event {
- NL80211_RADAR_CAC_ABORTED,
- NL80211_RADAR_NOP_FINISHED,
- NL80211_RADAR_PRE_CAC_EXPIRED,
-+ NL80211_RADAR_CAC_STARTED,
+ enum nl80211_preamble {
+ NL80211_PREAMBLE_LEGACY,
+ NL80211_PREAMBLE_HT,
+ NL80211_PREAMBLE_VHT,
+ NL80211_PREAMBLE_DMG,
++ NL80211_PREAMBLE_HE,
};
/**
-@@ -5425,11 +5748,11 @@ enum nl80211_nan_func_attributes {
- * @NL80211_NAN_SRF_INCLUDE: present if the include bit of the SRF set.
- * This is a flag.
- * @NL80211_NAN_SRF_BF: Bloom Filter. Present if and only if
-- * &NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary.
-+ * %NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary.
- * @NL80211_NAN_SRF_BF_IDX: index of the Bloom Filter. Mandatory if
-- * &NL80211_NAN_SRF_BF is present. This is a u8.
-+ * %NL80211_NAN_SRF_BF is present. This is a u8.
- * @NL80211_NAN_SRF_MAC_ADDRS: list of MAC addresses for the SRF. Present if
-- * and only if &NL80211_NAN_SRF_BF isn't present. This is a nested
-+ * and only if %NL80211_NAN_SRF_BF isn't present. This is a nested
- * attribute. Each nested attribute is a MAC address.
- * @NUM_NL80211_NAN_SRF_ATTR: internal
- * @NL80211_NAN_SRF_ATTR_MAX: highest NAN SRF attribute
-@@ -5469,4 +5792,15 @@ enum nl80211_nan_match_attributes {
- NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1
+@@ -6349,6 +6659,10 @@ enum nl80211_peer_measurement_attrs {
+ * is valid)
+ * @NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST: u32 attribute indicating
+ * the maximum FTMs per burst (if not present anything is valid)
++ * @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
+ *
+ * @NUM_NL80211_PMSR_FTM_CAPA_ATTR: internal
+ * @NL80211_PMSR_FTM_CAPA_ATTR_MAX: highest attribute number
+@@ -6364,6 +6678,8 @@ enum nl80211_peer_measurement_ftm_capa {
+ NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS,
+ NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT,
+ NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST,
++ NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED,
++ NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED,
+
+ /* keep last */
+ NUM_NL80211_PMSR_FTM_CAPA_ATTR,
+@@ -6393,6 +6709,20 @@ enum nl80211_peer_measurement_ftm_capa {
+ * @NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI: request LCI data (flag)
+ * @NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC: request civic location data
+ * (flag)
++ * @NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED: request trigger based ranging
++ * measurement (flag).
++ * This attribute and %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED are
++ * mutually exclusive.
++ * 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
++ * ranging measurement (flag)
++ * This attribute and %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED are
++ * mutually exclusive.
++ * 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.
+ *
+ * @NUM_NL80211_PMSR_FTM_REQ_ATTR: internal
+ * @NL80211_PMSR_FTM_REQ_ATTR_MAX: highest attribute number
+@@ -6409,6 +6739,8 @@ enum nl80211_peer_measurement_ftm_req {
+ NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES,
+ NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI,
+ NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC,
++ NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED,
++ NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED,
+
+ /* keep last */
+ NUM_NL80211_PMSR_FTM_REQ_ATTR,
+@@ -6548,5 +6880,51 @@ enum nl80211_obss_pd_attributes {
+ NL80211_HE_OBSS_PD_ATTR_MAX = __NL80211_HE_OBSS_PD_ATTR_LAST - 1,
};
+/**
-+ * 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.
++ * enum nl80211_bss_color_attributes - BSS Color attributes
++ * @__NL80211_HE_BSS_COLOR_ATTR_INVALID: Invalid
++ *
++ * @NL80211_HE_BSS_COLOR_ATTR_COLOR: the current BSS Color.
++ * @NL80211_HE_BSS_COLOR_ATTR_DISABLED: is BSS coloring disabled.
++ * @NL80211_HE_BSS_COLOR_ATTR_PARTIAL: the AID equation to be used..
++ *
++ * @__NL80211_HE_BSS_COLOR_ATTR_LAST: Internal
++ * @NL80211_HE_BSS_COLOR_ATTR_MAX: highest BSS Color attribute.
+ */
-+enum nl80211_external_auth_action {
-+ NL80211_EXTERNAL_AUTH_START,
-+ NL80211_EXTERNAL_AUTH_ABORT,
++enum nl80211_bss_color_attributes {
++ __NL80211_HE_BSS_COLOR_ATTR_INVALID,
++
++ NL80211_HE_BSS_COLOR_ATTR_COLOR,
++ NL80211_HE_BSS_COLOR_ATTR_DISABLED,
++ NL80211_HE_BSS_COLOR_ATTR_PARTIAL,
++
++ /* keep last */
++ __NL80211_HE_BSS_COLOR_ATTR_LAST,
++ NL80211_HE_BSS_COLOR_ATTR_MAX = __NL80211_HE_BSS_COLOR_ATTR_LAST - 1,
+};
+
++/**
++ * enum nl80211_iftype_akm_attributes - interface type AKM attributes
++ * @__NL80211_IFTYPE_AKM_ATTR_INVALID: Invalid
++ *
++ * @NL80211_IFTYPE_AKM_ATTR_IFTYPES: nested attribute containing a flag
++ * attribute for each interface type that supports AKM suites specified in
++ * %NL80211_IFTYPE_AKM_ATTR_SUITES
++ * @NL80211_IFTYPE_AKM_ATTR_SUITES: an array of u32. Used to indicate supported
++ * AKM suites for the specified interface types.
++ *
++ * @__NL80211_IFTYPE_AKM_ATTR_LAST: Internal
++ * @NL80211_IFTYPE_AKM_ATTR_MAX: highest interface type AKM attribute.
++ */
++enum nl80211_iftype_akm_attributes {
++ __NL80211_IFTYPE_AKM_ATTR_INVALID,
++
++ NL80211_IFTYPE_AKM_ATTR_IFTYPES,
++ NL80211_IFTYPE_AKM_ATTR_SUITES,
++
++ /* keep last */
++ __NL80211_IFTYPE_AKM_ATTR_LAST,
++ NL80211_IFTYPE_AKM_ATTR_MAX = __NL80211_IFTYPE_AKM_ATTR_LAST - 1,
++};
+
#endif /* __LINUX_NL80211_H */