mac80211: Update to version 5.8-rc2-1

The following patches:
* 972-ath10k_fix-crash-due-to-wrong-handling-of-peer_bw_rxnss_override-parameter.patch
* 973-ath10k_fix-band_center_freq-handling-for-VHT160-in-recent-firmwares.patch
are replaced by this commit in the upstream kernel:
* 3db24065c2c8 ("ath10k: enable VHT160 and VHT80+80 modes")

The following patches were applied upstream:
* 001-rt2800-enable-MFP-support-unconditionally.patch
* 090-wireless-Use-linux-stddef.h-instead-of-stddef.h.patch

The rtw88 driver is now split into multiple kernel modules, just put it
all into one OpenWrt kernel package.

rtl8812au-ct was patched to compile against the mac80211 from kernel
5.8, but not runtime tested.

Add a patch which fixes ath10k on IPQ40XX, this patch was send upstream
and fixes a crash when loading ath10k on this SoC.

Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq40xx/ map-ac2200]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

1 files changed, 273 insertions, 30 deletions

diff --git a/package/network/utils/iw/patches/001-nl80211_h_sync.patch b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
index 5084c5d45f..d935a1dc3e 100644
--- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch
+++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
@@ -55,7 +55,69 @@
   * enum nl80211_commands - supported nl80211 commands
   *
   * @NL80211_CMD_UNSPEC: unspecified command to catch errors
-@@ -571,6 +610,14 @@
+@@ -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).
@@ -70,26 +132,71 @@
   *	%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.
-@@ -1101,6 +1148,9 @@
+@@ -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 +1375,8 @@ enum nl80211_commands {
+@@ -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 */
-@@ -1580,7 +1632,8 @@ 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
@@ -99,7 +206,7 @@
   *
   * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
   *	We recommend using nested, driver-specific attributes within this.
-@@ -2373,6 +2426,53 @@ enum nl80211_commands {
+@@ -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.
   *
@@ -146,6 +253,17 @@
 + *	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.
@@ -153,7 +271,7 @@
   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
   * @NL80211_ATTR_MAX: highest attribute number currently defined
   * @__NL80211_ATTR_AFTER_LAST: internal use
-@@ -2835,6 +2935,21 @@ enum nl80211_attrs {
+@@ -2835,6 +2970,28 @@ enum nl80211_attrs {
  	NL80211_ATTR_WIPHY_EDMG_CHANNELS,
  	NL80211_ATTR_WIPHY_EDMG_BW_CONFIG,
  
@@ -170,29 +288,55 @@
 +	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,
-@@ -3554,6 +3669,8 @@ enum nl80211_wmm_rule {
+@@ -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
-@@ -3583,6 +3700,7 @@ enum nl80211_frequency_attr {
+@@ -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,
-@@ -3780,6 +3898,7 @@ enum nl80211_sched_scan_match_attr {
+@@ -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
@@ -200,7 +344,7 @@
   */
  enum nl80211_reg_rule_flags {
  	NL80211_RRF_NO_OFDM		= 1<<0,
-@@ -3797,6 +3916,7 @@ enum nl80211_reg_rule_flags {
+@@ -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,
@@ -208,7 +352,23 @@
  };
  
  #define NL80211_RRF_PASSIVE_SCAN	NL80211_RRF_NO_IR
-@@ -4503,6 +4623,7 @@ enum nl80211_key_default_types {
+@@ -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_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.
@@ -216,7 +376,7 @@
   *
   * @__NL80211_KEY_AFTER_LAST: internal
   * @NL80211_KEY_MAX: highest key attribute
-@@ -4518,6 +4639,7 @@ enum nl80211_key_attributes {
+@@ -4518,6 +4688,7 @@ enum nl80211_key_attributes {
  	NL80211_KEY_TYPE,
  	NL80211_KEY_DEFAULT_TYPES,
  	NL80211_KEY_MODE,
@@ -224,7 +384,7 @@
  
  	/* keep last */
  	__NL80211_KEY_AFTER_LAST,
-@@ -4674,6 +4796,69 @@ enum nl80211_tx_power_setting {
+@@ -4674,6 +4845,92 @@ enum nl80211_tx_power_setting {
  };
  
  /**
@@ -237,6 +397,17 @@
 +	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
@@ -244,12 +415,10 @@
 + *	(%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 no peer
-+ *	is selected, if set indicates that the new configuration overrides
-+ *	all previous peer configurations, otherwise previous peer specific
-+ *	configurations should be left untouched. If peer is selected then
-+ *	it will reset particular TID configuration of that peer and it will
-+ *	not accept other TID config attributes along with peer.
++ * @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.
@@ -265,12 +434,23 @@
 + *	&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 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_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,
@@ -284,6 +464,9 @@
 +	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,
@@ -294,7 +477,32 @@
   * 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
-@@ -5484,6 +5669,26 @@ enum nl80211_feature_flags {
+@@ -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_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).
   *
@@ -308,6 +516,8 @@
 + *
 + * @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
@@ -318,10 +528,21 @@
 + * @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 +5734,12 @@ enum nl80211_ext_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,
@@ -331,10 +552,32 @@
 +	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,
-@@ -6151,12 +6362,14 @@ enum nl80211_ftm_responder_stats {
+@@ -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
@@ -349,7 +592,7 @@
  };
  
  /**
-@@ -6349,6 +6562,10 @@ enum nl80211_peer_measurement_attrs {
+@@ -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)
@@ -360,7 +603,7 @@
   *
   * @NUM_NL80211_PMSR_FTM_CAPA_ATTR: internal
   * @NL80211_PMSR_FTM_CAPA_ATTR_MAX: highest attribute number
-@@ -6364,6 +6581,8 @@ enum nl80211_peer_measurement_ftm_capa {
+@@ -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,
@@ -369,7 +612,7 @@
  
  	/* keep last */
  	NUM_NL80211_PMSR_FTM_CAPA_ATTR,
-@@ -6393,6 +6612,20 @@ enum nl80211_peer_measurement_ftm_capa {
+@@ -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)
@@ -390,7 +633,7 @@
   *
   * @NUM_NL80211_PMSR_FTM_REQ_ATTR: internal
   * @NL80211_PMSR_FTM_REQ_ATTR_MAX: highest attribute number
-@@ -6409,6 +6642,8 @@ enum nl80211_peer_measurement_ftm_req {
+@@ -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,
@@ -399,7 +642,7 @@
  
  	/* keep last */
  	NUM_NL80211_PMSR_FTM_REQ_ATTR,
-@@ -6548,5 +6783,51 @@ enum nl80211_obss_pd_attributes {
+@@ -6548,5 +6880,51 @@ enum nl80211_obss_pd_attributes {
  	NL80211_HE_OBSS_PD_ATTR_MAX = __NL80211_HE_OBSS_PD_ATTR_LAST - 1,
  };