--- a/nl80211.h
+++ b/nl80211.h
-@@ -303,8 +303,9 @@
- * passed, all channels allowed for the current regulatory domain
- * are used. Extra IEs can also be passed from the userspace by
- * using the %NL80211_ATTR_IE attribute.
-- * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT
-- * if scheduled scan is not running.
-+ * @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan. Returns -ENOENT if
-+ * scheduled scan is not running. The caller may assume that as soon
-+ * as the call returns, it is safe to start a new scheduled scan again.
- * @NL80211_CMD_SCHED_SCAN_RESULTS: indicates that there are scheduled scan
- * results available.
- * @NL80211_CMD_SCHED_SCAN_STOPPED: indicates that the scheduled scan has
-@@ -418,8 +419,18 @@
+@@ -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-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
+@@ -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
+ *
+ * @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,
-- * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
-- * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
-+ * %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
-+ * %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %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
-+ * within the ESS. %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT
-+ * can be included to provide a recommendation of the initial BSS while
-+ * allowing the driver to roam to other BSSes within the ESS and also to
-+ * ignore this recommendation if the indicated BSS is not ideal. Only one
-+ * 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).
- * Background scan period can optionally be
- * specified in %NL80211_ATTR_BG_SCAN_PERIOD,
- * if not specified default background scan configuration
-@@ -1555,6 +1566,22 @@ enum nl80211_commands {
- * data is in the format defined for the payload of the QoS Map Set element
- * in IEEE Std 802.11-2012, 8.4.2.97.
+- * 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_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_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
+ */
+@@ -1325,6 +1394,12 @@ enum nl80211_commands {
+
+ NL80211_CMD_PROBE_MESH_LINK,
+
++ NL80211_CMD_SET_TID_CONFIG,
++
++ NL80211_CMD_UNPROT_BEACON,
++
++ NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS,
++
+ /* add new commands above here */
+
+ /* used to define NL80211_CMD_MAX below */
+@@ -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_MAC_HINT: MAC address recommendation as initial BSS
-+ * @NL80211_ATTR_WIPHY_FREQ_HINT: frequency of the recommended initial BSS
+ * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
+ * We recommend using nested, driver-specific attributes within this.
+@@ -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_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_MAX_AP_ASSOC_STA: Device attribute that indicates how many
-+ * associated stations are supported in AP mode (including P2P GO); u32.
-+ * Since drivers may not have a fixed limit on the maximum number (e.g.,
-+ * other concurrent operations may affect this), drivers are allowed to
-+ * advertise values that cannot always be met. In such cases, an attempt
-+ * to add a new station entry with @NL80211_CMD_NEW_STATION may fail.
++ * @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_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32.
-+ * As specified in the &enum nl80211_tdls_peer_capability.
++ * @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
- */
-@@ -1883,6 +1910,15 @@ enum nl80211_attrs {
+@@ -2835,6 +2970,28 @@ enum nl80211_attrs {
+ NL80211_ATTR_WIPHY_EDMG_CHANNELS,
+ NL80211_ATTR_WIPHY_EDMG_BW_CONFIG,
- NL80211_ATTR_QOS_MAP,
-
-+ NL80211_ATTR_MAC_HINT,
-+ NL80211_ATTR_WIPHY_FREQ_HINT,
++ NL80211_ATTR_VLAN_ID,
++
++ NL80211_ATTR_HE_BSS_COLOR,
++
++ NL80211_ATTR_IFTYPE_AKM_SUITES,
+
-+ NL80211_ATTR_MAX_AP_ASSOC_STA,
++ NL80211_ATTR_TID_CONFIG,
+
-+ NL80211_ATTR_TDLS_PEER_CAPABILITY,
++ NL80211_ATTR_CONTROL_PORT_NO_PREAUTH,
++
++ 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,
-@@ -2304,6 +2340,7 @@ enum nl80211_band_attr {
- * @NL80211_FREQUENCY_ATTR_NO_160MHZ: any 160 MHz (but not 80+80) channel
- * using this channel as the primary or any of the secondary channels
- * isn't possible
-+ * @NL80211_FREQUENCY_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds.
+@@ -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,
+
+ /* 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
-@@ -2322,6 +2359,7 @@ enum nl80211_frequency_attr {
- NL80211_FREQUENCY_ATTR_NO_HT40_PLUS,
- NL80211_FREQUENCY_ATTR_NO_80MHZ,
- NL80211_FREQUENCY_ATTR_NO_160MHZ,
-+ NL80211_FREQUENCY_ATTR_DFS_CAC_TIME,
+@@ -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,
/* keep last */
__NL80211_FREQUENCY_ATTR_AFTER_LAST,
-@@ -2412,12 +2450,14 @@ enum nl80211_reg_type {
- * 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.
-+ * 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.
- * @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for
- * 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_REG_RULE_ATTR_MAX: highest regulatory rule attribute number
- * currently defined
- * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use
-@@ -2433,6 +2473,8 @@ enum nl80211_reg_rule_attr {
- NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN,
- NL80211_ATTR_POWER_RULE_MAX_EIRP,
-
-+ NL80211_ATTR_DFS_CAC_TIME,
-+
- /* keep last */
- __NL80211_REG_RULE_ATTR_AFTER_LAST,
- NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1
-@@ -2442,9 +2484,15 @@ enum nl80211_reg_rule_attr {
- * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
- * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
-- * only report BSS with matching SSID.
-+ * only report BSS with matching SSID.
- * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
-- * BSS in scan results. Filtering is turned off if not specified.
-+ * BSS in scan results. Filtering is turned off if not specified. Note that
-+ * if this attribute is in a match set of its own, then it is treated as
-+ * the default value for all matchsets with an SSID, rather than being a
-+ * matchset of its own without an RSSI filter. This is due to problems with
-+ * how this API was implemented in the past. Also, due to the same problem,
-+ * the only way to create a matchset with only an RSSI filter (with this
-+ * attribute) is if there's only a single matchset with the RSSI attribute.
- * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
- * attribute number currently defined
- * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
-@@ -2477,6 +2525,9 @@ enum nl80211_sched_scan_match_attr {
- * @NL80211_RRF_NO_IR: no mechanisms that initiate radiation are allowed,
- * this includes probe requests or modes of operation that require
- * beaconing.
-+ * @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.
+@@ -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_reg_rule_flags {
NL80211_RRF_NO_OFDM = 1<<0,
-@@ -2488,6 +2539,7 @@ enum nl80211_reg_rule_flags {
- NL80211_RRF_PTMP_ONLY = 1<<6,
- NL80211_RRF_NO_IR = 1<<7,
- __NL80211_RRF_NO_IBSS = 1<<8,
-+ NL80211_RRF_AUTO_BW = 1<<11,
+@@ -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,
};
#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
-@@ -3131,6 +3183,7 @@ enum nl80211_key_attributes {
- * in an array of MCS numbers.
- * @NL80211_TXRATE_VHT: VHT rates allowed for TX rate selection,
- * see &struct nl80211_txrate_vht
-+ * @NL80211_TXRATE_GI: configure GI, see &enum nl80211_txrate_gi
- * @__NL80211_TXRATE_AFTER_LAST: internal
- * @NL80211_TXRATE_MAX: highest TX rate attribute
+@@ -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
*/
-@@ -3139,6 +3192,7 @@ enum nl80211_tx_rate_attributes {
- NL80211_TXRATE_LEGACY,
- NL80211_TXRATE_HT,
- NL80211_TXRATE_VHT,
-+ NL80211_TXRATE_GI,
+@@ -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_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 */
- __NL80211_TXRATE_AFTER_LAST,
-@@ -3156,6 +3210,12 @@ struct nl80211_txrate_vht {
- __u16 mcs[NL80211_VHT_NSS_MAX];
+ __NL80211_KEY_AFTER_LAST,
+@@ -4674,6 +4845,92 @@ enum nl80211_tx_power_setting {
};
-+enum nl80211_txrate_gi {
-+ NL80211_TXRATE_DEFAULT_GI,
-+ NL80211_TXRATE_FORCE_SGI,
-+ NL80211_TXRATE_FORCE_LGI,
+ /**
++ * 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_tid_config {
++ NL80211_TID_CONFIG_ENABLE,
++ NL80211_TID_CONFIG_DISABLE,
+};
+
++/* 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_tx_rate_setting {
++ NL80211_TX_RATE_AUTOMATIC,
++ NL80211_TX_RATE_LIMITED,
++ NL80211_TX_RATE_FIXED,
++};
++
++/* 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_TID_CONFIG_ATTR_AFTER_LAST,
++ NL80211_TID_CONFIG_ATTR_MAX = __NL80211_TID_CONFIG_ATTR_AFTER_LAST - 1
++};
++
++/**
+ * 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 {
+
+ #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_band - Frequency band
- * @NL80211_BAND_2GHZ: 2.4 GHz ISM band
-@@ -3801,11 +3861,6 @@ enum nl80211_ap_sme_features {
- * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested
- * to work properly to suppport receiving regulatory hints from
- * cellular base stations.
-- * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: If this is set, an active
-- * P2P Device (%NL80211_IFTYPE_P2P_DEVICE) requires its own channel
-- * in the interface combinations, even when it's only used for scan
-- * and remain-on-channel. This could be due to, for example, the
-- * remain-on-channel implementation requiring a channel context.
- * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of
- * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station
- * mode
-@@ -3847,7 +3902,7 @@ enum nl80211_feature_flags {
- NL80211_FEATURE_HT_IBSS = 1 << 1,
- NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2,
- NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3,
-- NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 1 << 4,
-+ /* bit 4 is reserved - don't use */
- NL80211_FEATURE_SAE = 1 << 5,
- NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6,
- NL80211_FEATURE_SCAN_FLUSH = 1 << 7,
-@@ -4037,4 +4092,20 @@ struct nl80211_vendor_cmd_info {
- __u32 subcmd;
+@@ -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 */
+ 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.
+ */
+@@ -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,
+@@ -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,
+@@ -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,
+ };
+
+ /**
+@@ -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_preamble {
+ NL80211_PREAMBLE_LEGACY,
+ NL80211_PREAMBLE_HT,
+ NL80211_PREAMBLE_VHT,
+ NL80211_PREAMBLE_DMG,
++ NL80211_PREAMBLE_HE,
+ };
+
+ /**
+@@ -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,
};
+/**
-+ * enum nl80211_tdls_peer_capability - TDLS peer flags.
++ * enum nl80211_bss_color_attributes - BSS Color attributes
++ * @__NL80211_HE_BSS_COLOR_ATTR_INVALID: Invalid
+ *
-+ * Used by tdls_mgmt() to determine which conditional elements need
-+ * to be added to TDLS Setup frames.
++ * @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_TDLS_PEER_HT: TDLS peer is HT capable.
-+ * @NL80211_TDLS_PEER_VHT: TDLS peer is VHT capable.
-+ * @NL80211_TDLS_PEER_WMM: TDLS peer is WMM capable.
++ * @__NL80211_HE_BSS_COLOR_ATTR_LAST: Internal
++ * @NL80211_HE_BSS_COLOR_ATTR_MAX: highest BSS Color attribute.
+ */
-+enum nl80211_tdls_peer_capability {
-+ NL80211_TDLS_PEER_HT = 1<<0,
-+ NL80211_TDLS_PEER_VHT = 1<<1,
-+ NL80211_TDLS_PEER_WMM = 1<<2,
++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 */