--- a/nl80211.h
+++ b/nl80211.h
-@@ -323,7 +323,7 @@
- * @NL80211_CMD_GET_SCAN: get scan results
- * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
- * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
-- * probe requests at CCK rate or not. %NL80211_ATTR_MAC can be used to
-+ * probe requests at CCK rate or not. %NL80211_ATTR_BSSID can be used to
- * specify a BSSID to scan for; if not included, the wildcard BSSID will
- * be used.
- * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
-@@ -600,6 +600,20 @@
+@@ -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
*
- * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.
+ * 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_SET_MULTICAST_TO_UNICAST: Configure if this AP should perform
-+ * multicast to unicast conversion. When enabled, all multicast packets
-+ * with ethertype ARP, IPv4 or IPv6 (possibly within an 802.1Q header)
-+ * will be sent out to each station once with the destination (multicast)
-+ * MAC address replaced by the station's MAC address. Note that this may
-+ * break certain expectations of the receiver, e.g. the ability to drop
-+ * unicast IP packets encapsulated in multicast L2 frames, or the ability
-+ * to not send destination unreachable messages in such cases.
-+ * This can only be toggled per BSS. Configure this on an interface of
-+ * type %NL80211_IFTYPE_AP. It applies to all its VLAN interfaces
-+ * (%NL80211_IFTYPE_AP_VLAN), except for those in 4addr (WDS) mode.
-+ * If %NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED is not present with this
-+ * command, the feature is disabled.
-+ *
- * @NL80211_CMD_JOIN_MESH: Join a mesh. The mesh ID must be given, and initial
- * mesh config parameters may be given.
- * @NL80211_CMD_LEAVE_MESH: Leave the mesh network -- no special arguments, the
-@@ -874,6 +888,12 @@
- * This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and
- * %NL80211_ATTR_COOKIE.
+ * @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_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_UPDATE_CONNECT_PARAMS: Update one or more connect parameters
-+ * for subsequent roaming cases if the driver or firmware uses internal
-+ * BSS selection. This command can be issued only while connected and it
-+ * does not result in a change for the current association. Currently,
-+ * only the %NL80211_ATTR_IE data is used and updated with this command.
++ * @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
*/
-@@ -1069,6 +1089,10 @@ enum nl80211_commands {
- NL80211_CMD_CHANGE_NAN_CONFIG,
- NL80211_CMD_NAN_MATCH,
+@@ -1325,6 +1394,12 @@ enum nl80211_commands {
+
+ NL80211_CMD_PROBE_MESH_LINK,
-+ NL80211_CMD_SET_MULTICAST_TO_UNICAST,
++ NL80211_CMD_SET_TID_CONFIG,
+
-+ NL80211_CMD_UPDATE_CONNECT_PARAMS,
++ NL80211_CMD_UNPROT_BEACON,
++
++ NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS,
+
/* add new commands above here */
/* used to define NL80211_CMD_MAX below */
-@@ -1638,8 +1662,16 @@ enum nl80211_commands {
- * the connection request from a station. nl80211_connect_failed_reason
- * enum has different reasons of connection failure.
- *
-- * @NL80211_ATTR_SAE_DATA: SAE elements in Authentication frames. This starts
-- * with the Authentication transaction sequence number field.
-+ * @NL80211_ATTR_AUTH_DATA: Fields and elements in Authentication frames.
-+ * This contains the authentication frame body (non-IE and IE data),
-+ * excluding the Authentication algorithm number, i.e., starting at the
-+ * Authentication transaction sequence number field. It is used with
-+ * authentication algorithms that need special fields to be added into
-+ * the frames (SAE and FILS). Currently, only the SAE cases use the
-+ * initial two fields (Authentication transaction sequence number and
-+ * Status code). However, those fields are included in the attribute data
-+ * for all authentication algorithms to keep the attribute definition
-+ * consistent.
- *
- * @NL80211_ATTR_VHT_CAPABILITY: VHT Capability information element (from
- * association request when used with NL80211_CMD_NEW_STATION)
-@@ -1740,7 +1772,9 @@ enum nl80211_commands {
+@@ -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_OPMODE_NOTIF: Operating mode field from Operating Mode
- * Notification Element based on association request when used with
-- * %NL80211_CMD_NEW_STATION; u8 attribute.
-+ * %NL80211_CMD_NEW_STATION or %NL80211_CMD_SET_STATION (only when
-+ * %NL80211_FEATURE_FULL_AP_CLIENT_STATE is supported, or with TDLS);
-+ * u8 attribute.
+ * @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_VENDOR_ID: The vendor ID, either a 24-bit OUI or, if
- * %NL80211_VENDOR_ID_IS_LINUX is set, a special Linux ID (not used yet)
-@@ -1788,6 +1822,8 @@ enum nl80211_commands {
- * and remove functions. NAN notifications will be sent in unicast to that
- * socket. Without this attribute, any socket can add functions and the
- * notifications will be sent to the %NL80211_MCGRP_NAN multicast group.
-+ * If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the
-+ * station will deauthenticate when the socket is closed.
- *
- * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
- * the TDLS link initiator.
-@@ -1936,6 +1972,38 @@ enum nl80211_commands {
- * attribute.
- * @NL80211_ATTR_NAN_MATCH: used to report a match. This is a nested attribute.
- * See &enum nl80211_nan_match_attributes.
-+ * @NL80211_ATTR_FILS_KEK: KEK for FILS (Re)Association Request/Response frame
-+ * protection.
-+ * @NL80211_ATTR_FILS_NONCES: Nonces (part of AAD) for FILS (Re)Association
-+ * Request/Response frame protection. This attribute contains the 16 octet
-+ * STA Nonce followed by 16 octets of AP Nonce.
-+ *
-+ * @NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED: Indicates whether or not multicast
-+ * packets should be send out as unicast to all stations (flag attribute).
-+ *
-+ * @NL80211_ATTR_BSSID: The BSSID of the AP. Note that %NL80211_ATTR_MAC is also
-+ * used in various commands/events for specifying the BSSID.
-+ *
-+ * @NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI: Relative RSSI threshold by which
-+ * other BSSs has to be better or slightly worse than the current
-+ * connected BSS so that they get reported to user space.
-+ * This will give an opportunity to userspace to consider connecting to
-+ * other matching BSSs which have better or slightly worse RSSI than
-+ * the current connected BSS by using an offloaded operation to avoid
-+ * unnecessary wakeups.
-+ *
-+ * @NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST: When present the RSSI level for BSSs in
-+ * the specified band is to be adjusted before doing
-+ * %NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI based comparision to figure out
-+ * better BSSs. The attribute value is a packed structure
-+ * value as specified by &struct nl80211_bss_select_rssi_adjust.
-+ *
-+ * @NL80211_ATTR_TIMEOUT_REASON: The reason for which an operation timed out.
-+ * u32 attribute with an &enum nl80211_timeout_reason value. This is used,
-+ * e.g., with %NL80211_CMD_CONNECT event.
++ * @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
-@@ -2195,7 +2263,7 @@ enum nl80211_attrs {
-
- NL80211_ATTR_CONN_FAILED_REASON,
-
-- NL80211_ATTR_SAE_DATA,
-+ NL80211_ATTR_AUTH_DATA,
+ * @__NL80211_ATTR_AFTER_LAST: internal use
+@@ -2835,6 +2970,28 @@ enum nl80211_attrs {
+ NL80211_ATTR_WIPHY_EDMG_CHANNELS,
+ NL80211_ATTR_WIPHY_EDMG_BW_CONFIG,
- NL80211_ATTR_VHT_CAPABILITY,
-
-@@ -2336,6 +2404,20 @@ enum nl80211_attrs {
- NL80211_ATTR_NAN_FUNC,
- NL80211_ATTR_NAN_MATCH,
-
-+ NL80211_ATTR_FILS_KEK,
-+ NL80211_ATTR_FILS_NONCES,
++ NL80211_ATTR_VLAN_ID,
++
++ NL80211_ATTR_HE_BSS_COLOR,
+
-+ NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED,
++ NL80211_ATTR_IFTYPE_AKM_SUITES,
+
-+ NL80211_ATTR_BSSID,
++ NL80211_ATTR_TID_CONFIG,
+
-+ NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI,
-+ NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST,
++ NL80211_ATTR_CONTROL_PORT_NO_PREAUTH,
+
-+ NL80211_ATTR_TIMEOUT_REASON,
++ 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,
-@@ -2347,6 +2429,7 @@ enum nl80211_attrs {
- #define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
- #define NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG
- #define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER
-+#define NL80211_ATTR_SAE_DATA NL80211_ATTR_AUTH_DATA
-
- /*
- * Allow user space programs to use #ifdef on new attributes by defining them
-@@ -3027,6 +3110,13 @@ enum nl80211_reg_rule_attr {
- * 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_RELATIVE_RSSI: Flag indicating whether
-+ * %NL80211_SCHED_SCAN_MATCH_ATTR_RSSI to be used as absolute RSSI or
-+ * relative to current bss's RSSI.
-+ * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI_ADJUST: When present the RSSI level for
-+ * BSS-es in the specified band is to be adjusted before doing
-+ * RSSI-based BSS selection. The attribute value is a packed structure
-+ * value as specified by &struct nl80211_bss_select_rssi_adjust.
- * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
- * attribute number currently defined
- * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
-@@ -3036,6 +3126,8 @@ enum nl80211_sched_scan_match_attr {
+@@ -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,
- NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
- NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
-+ NL80211_SCHED_SCAN_MATCH_ATTR_RELATIVE_RSSI,
-+ NL80211_SCHED_SCAN_MATCH_ATTR_RSSI_ADJUST,
+ /* 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,
/* keep last */
- __NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST,
-@@ -3660,6 +3752,9 @@ enum nl80211_bss_status {
- * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
- * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
- * @NL80211_AUTHTYPE_SAE: Simultaneous authentication of equals
-+ * @NL80211_AUTHTYPE_FILS_SK: Fast Initial Link Setup shared key
-+ * @NL80211_AUTHTYPE_FILS_SK_PFS: Fast Initial Link Setup shared key with PFS
-+ * @NL80211_AUTHTYPE_FILS_PK: Fast Initial Link Setup public key
- * @__NL80211_AUTHTYPE_NUM: internal
- * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
- * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
-@@ -3672,6 +3767,9 @@ enum nl80211_auth_type {
- NL80211_AUTHTYPE_FT,
- NL80211_AUTHTYPE_NETWORK_EAP,
- NL80211_AUTHTYPE_SAE,
-+ NL80211_AUTHTYPE_FILS_SK,
-+ NL80211_AUTHTYPE_FILS_SK_PFS,
-+ NL80211_AUTHTYPE_FILS_PK,
+ __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_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,
+ };
+
+ #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
+ */
+@@ -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_AUTHTYPE_NUM,
-@@ -4280,6 +4378,9 @@ enum nl80211_iface_limit_attrs {
- * of supported channel widths for radar detection.
- * @NL80211_IFACE_COMB_RADAR_DETECT_REGIONS: u32 attribute containing the bitmap
- * of supported regulatory regions for radar detection.
-+ * @NL80211_IFACE_COMB_BI_MIN_GCD: u32 attribute specifying the minimum GCD of
-+ * different beacon intervals supported by all the interface combinations
-+ * in this group (if not present, all beacon intervals be identical).
- * @NUM_NL80211_IFACE_COMB: number of attributes
- * @MAX_NL80211_IFACE_COMB: highest attribute number
- *
-@@ -4287,8 +4388,8 @@ enum nl80211_iface_limit_attrs {
- * limits = [ #{STA} <= 1, #{AP} <= 1 ], matching BI, channels = 1, max = 2
- * => allows an AP and a STA that must match BIs
+ __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
*
-- * numbers = [ #{AP, P2P-GO} <= 8 ], channels = 1, max = 8
-- * => allows 8 of AP/GO
-+ * numbers = [ #{AP, P2P-GO} <= 8 ], BI min gcd, channels = 1, max = 8,
-+ * => allows 8 of AP/GO that can have BI gcd >= min gcd
- *
- * numbers = [ #{STA} <= 2 ], channels = 2, max = 2
- * => allows two STAs on different channels
-@@ -4314,6 +4415,7 @@ enum nl80211_if_combination_attrs {
- NL80211_IFACE_COMB_NUM_CHANNELS,
- NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
- NL80211_IFACE_COMB_RADAR_DETECT_REGIONS,
-+ NL80211_IFACE_COMB_BI_MIN_GCD,
+ * @__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_KEY_AFTER_LAST,
+@@ -4674,6 +4845,92 @@ enum nl80211_tx_power_setting {
+ };
+
+ /**
++ * 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
+
+ /**
+@@ -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_IFACE_COMB,
-@@ -4634,6 +4736,15 @@ enum nl80211_feature_flags {
- * configuration (AP/mesh) with HT rates.
- * @NL80211_EXT_FEATURE_BEACON_RATE_VHT: Driver supports beacon rate
- * configuration (AP/mesh) with VHT rates.
-+ * @NL80211_EXT_FEATURE_FILS_STA: This driver supports Fast Initial Link Setup
-+ * with user space SME (NL80211_CMD_AUTHENTICATE) in station mode.
-+ * @NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA: This driver supports randomized TA
-+ * in @NL80211_CMD_FRAME while not associated.
-+ * @NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED: This driver supports
-+ * randomized TA in @NL80211_CMD_FRAME while associated.
-+ * @NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI: The driver supports sched_scan
-+ * for reporting BSSs with better RSSI than the current connected BSS
-+ * (%NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI).
+ 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.
-@@ -4648,6 +4759,10 @@ enum nl80211_ext_feature_index {
- NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
- NL80211_EXT_FEATURE_BEACON_RATE_HT,
- NL80211_EXT_FEATURE_BEACON_RATE_VHT,
-+ NL80211_EXT_FEATURE_FILS_STA,
-+ NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA,
-+ NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED,
-+ NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI,
+ */
+@@ -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,
-@@ -4687,6 +4802,21 @@ enum nl80211_connect_failed_reason {
+@@ -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,
};
/**
-+ * enum nl80211_timeout_reason - timeout reasons
+@@ -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_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_TIMEOUT_UNSPECIFIED: Timeout reason unspecified.
-+ * @NL80211_TIMEOUT_SCAN: Scan (AP discovery) timed out.
-+ * @NL80211_TIMEOUT_AUTH: Authentication timed out.
-+ * @NL80211_TIMEOUT_ASSOC: Association timed out.
++ * @__NL80211_HE_BSS_COLOR_ATTR_LAST: Internal
++ * @NL80211_HE_BSS_COLOR_ATTR_MAX: highest BSS Color attribute.
+ */
-+enum nl80211_timeout_reason {
-+ NL80211_TIMEOUT_UNSPECIFIED,
-+ NL80211_TIMEOUT_SCAN,
-+ NL80211_TIMEOUT_AUTH,
-+ NL80211_TIMEOUT_ASSOC,
++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_scan_flags - scan request control flags
- *
- * Scan request control flags are used to control the handling
-@@ -4900,8 +5030,9 @@ enum nl80211_sched_scan_plan {
- /**
- * struct nl80211_bss_select_rssi_adjust - RSSI adjustment parameters.
- *
-- * @band: band of BSS that must match for RSSI value adjustment.
-- * @delta: value used to adjust the RSSI value of matching BSS.
-+ * @band: band of BSS that must match for RSSI value adjustment. The value
-+ * of this field is according to &enum nl80211_band.
-+ * @delta: value used to adjust the RSSI value of matching BSS in dB.
- */
- struct nl80211_bss_select_rssi_adjust {
- __u8 band;
++ * 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 */
projects / openwrt / openwrt.git / blobdiff