mac80211: fixed slow wireless startup (#4420)

* hostapd: reduce to a single instance per service

* mac80211: sync upstream source code

* iw: bump to 5.4

package/base-files/files/sbin/wifi

@@ -6,7 +6,7 @@
 
 usage() {
 	cat <<EOF
-Usage: $0 [config|up|down|reload|status]
+Usage: $0 [config|up|down|reconf|reload|status]
 enables (default), disables or configures devices not yet configured.
 EOF
 	exit 1

package/kernel/mac80211/Makefile

@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 
 PKG_VERSION:=5.4.27-1
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.4.27/
 PKG_HASH:=4c853a2f4c4fcc81cf60a3d59c5efbdb60c3e4acda22996cb192443581753950
 

package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh

@@ -440,22 +440,23 @@ mac80211_iw_interface_add() {
 	local type="$3"
 	local wdsflag="$4"
 	local rc
+	local oldifname
 
-	iw phy "$phy" interface add "$ifname" type "$type" $wdsflag
+	iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
 	rc="$?"
 
 	[ "$rc" = 233 ] && {
 		# Device might have just been deleted, give the kernel some time to finish cleaning it up
 		sleep 1
 
-		iw phy "$phy" interface add "$ifname" type "$type" $wdsflag
+		iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
 		rc="$?"
 	}
 
 	[ "$rc" = 233 ] && {
 		# Keep matching pre-existing interface
 		[ -d "/sys/class/ieee80211/${phy}/device/net/${ifname}" ] && \
-		case "$(iw dev wlan0 info | grep "^\ttype" | cut -d' ' -f2- 2>/dev/null)" in
+		case "$(iw dev $ifname info | grep "^\ttype" | cut -d' ' -f2- 2>/dev/null)" in
 			"AP")
 				[ "$type" = "__ap" ] && rc=0
 				;;
@@ -475,17 +476,26 @@ mac80211_iw_interface_add() {
 	}
 
 	[ "$rc" = 233 ] && {
-		iw dev "$ifname" del
+		iw dev "$ifname" del >/dev/null 2>&1
-		sleep 1
+		[ "$?" = 0 ] && {
+			sleep 1
 
-		iw phy "$phy" interface add "$ifname" type "$type" $wdsflag
+			iw phy "$phy" interface add "$ifname" type "$type" $wdsflag >/dev/null 2>&1
-		rc="$?"
+			rc="$?"
+		}
 	}
 
-	[ "$rc" = 233 ] && {
+	[ "$rc" != 0 ] && {
 		# Device might not support virtual interfaces, so the interface never got deleted in the first place.
 		# Check if the interface already exists, and avoid failing in this case.
-		ip link show dev "$ifname" >/dev/null 2>/dev/null && rc=0
+		[ -d "/sys/class/ieee80211/${phy}/device/net/${ifname}" ] && rc=0
+	}
+
+	[ "$rc" != 0 ] && {
+		# Device doesn't support virtual interfaces and may have existing interface other than ifname.
+		oldifname="$(basename "/sys/class/ieee80211/${phy}/device/net"/* 2>/dev/null)"
+		[ "$oldifname" ] && ip link set "$oldifname" name "$ifname" 1>/dev/null 2>&1
+		rc="$?"
 	}
 
 	[ "$rc" != 0 ] && wireless_setup_failed INTERFACE_CREATION_FAILED
@@ -594,11 +604,11 @@ mac80211_setup_supplicant() {
 	NEWSPLIST="${NEWSPLIST}$ifname "
 
 	if [ "${NEWAPLIST%% *}" != "${OLDAPLIST%% *}" ]; then
-		[ "$spobj" ] && ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}"
+		[ "$spobj" ] && ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
 		add_sp=1
 	fi
 	[ "$enable" = 0 ] && {
-		ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}"
+		ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
 		ip link set dev "$ifname" down
 		return 0
 	}
@@ -623,7 +633,7 @@ mac80211_setup_supplicant_noctl() {
 
 	NEWSPLIST="${NEWSPLIST}$ifname "
 	[ "$enable" = 0 ] && {
-		ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}"
+		ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
 		ip link set dev "$ifname" down
 		return 0
 	}
@@ -814,7 +824,7 @@ mac80211_vap_cleanup() {
 	local vaps="$2"
 
 	for wdev in $vaps; do
-		[ "$service" != "none" ] && ubus call ${service}.${phy} config_remove "{\"iface\":\"$wdev\"}"
+		[ "$service" != "none" ] && ubus call ${service} config_remove "{\"iface\":\"$wdev\"}"
 		ip link set dev "$wdev" down 2>/dev/null
 		iw dev "$wdev" del
 	done
@@ -962,9 +972,9 @@ drv_mac80211_setup() {
 		fi
 		if [ "$no_reload" != "0" ]; then
 			add_ap=1
-			ubus wait_for hostapd.$phy
+			ubus wait_for hostapd
-			ubus call hostapd.${phy} config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}"
+			ubus call hostapd config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}"
-			local hostapd_pid=$(ubus call service list '{"name": "hostapd"}' | jsonfilter -l 1 -e "@['hostapd'].instances['hostapd-${phy}'].pid")
+			local hostapd_pid=$(ubus call service list '{"name": "hostapd"}' | jsonfilter -l 1 -e "@['hostapd'].instances['hostapd'].pid")
 			wireless_add_process "$hostapd_pid" "/usr/sbin/hostapd" 1
 		fi
 		ret="$?"

package/kernel/mac80211/patches/subsys/314-mac80211-drop-data-frames-without-key-on-encrypted-l.patch

@@ -0,0 +1,148 @@
+From a0761a301746ec2d92d7fcb82af69c0a6a4339aa Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Thu, 26 Mar 2020 15:09:42 +0200
+Subject: mac80211: drop data frames without key on encrypted links
+
+If we know that we have an encrypted link (based on having had
+a key configured for TX in the past) then drop all data frames
+in the key selection handler if there's no key anymore.
+
+This fixes an issue with mac80211 internal TXQs - there we can
+buffer frames for an encrypted link, but then if the key is no
+longer there when they're dequeued, the frames are sent without
+encryption. This happens if a station is disconnected while the
+frames are still on the TXQ.
+
+Detecting that a link should be encrypted based on a first key
+having been configured for TX is fine as there are no use cases
+for a connection going from with encryption to no encryption.
+With extended key IDs, however, there is a case of having a key
+configured for only decryption, so we can't just trigger this
+behaviour on a key being configured.
+
+Cc: stable@vger.kernel.org
+Reported-by: Jouni Malinen <j@w1.fi>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+---
+ net/mac80211/debugfs_sta.c |  3 ++-
+ net/mac80211/key.c         | 20 ++++++++++++--------
+ net/mac80211/sta_info.h    |  1 +
+ net/mac80211/tx.c          | 12 +++++++++---
+ 4 files changed, 24 insertions(+), 12 deletions(-)
+
+--- a/net/mac80211/debugfs_sta.c
++++ b/net/mac80211/debugfs_sta.c
+@@ -5,7 +5,7 @@
+  * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>
+  * Copyright 2013-2014  Intel Mobile Communications GmbH
+  * Copyright(c) 2016 Intel Deutschland GmbH
+- * Copyright (C) 2018 - 2019 Intel Corporation
++ * Copyright (C) 2018 - 2020 Intel Corporation
+  */
+ 
+ #include <linux/debugfs.h>
+@@ -78,6 +78,7 @@ static const char * const sta_flag_names
+ 	FLAG(MPSP_OWNER),
+ 	FLAG(MPSP_RECIPIENT),
+ 	FLAG(PS_DELIVER),
++	FLAG(USES_ENCRYPTION),
+ #undef FLAG
+ };
+ 
+--- a/net/mac80211/key.c
++++ b/net/mac80211/key.c
+@@ -6,7 +6,7 @@
+  * Copyright 2007-2008	Johannes Berg <johannes@sipsolutions.net>
+  * Copyright 2013-2014  Intel Mobile Communications GmbH
+  * Copyright 2015-2017	Intel Deutschland GmbH
+- * Copyright 2018-2019  Intel Corporation
++ * Copyright 2018-2020  Intel Corporation
+  */
+ 
+ #include <linux/if_ether.h>
+@@ -262,22 +262,29 @@ static void ieee80211_key_disable_hw_acc
+ 			  sta ? sta->sta.addr : bcast_addr, ret);
+ }
+ 
+-int ieee80211_set_tx_key(struct ieee80211_key *key)
++static int _ieee80211_set_tx_key(struct ieee80211_key *key, bool force)
+ {
+ 	struct sta_info *sta = key->sta;
+ 	struct ieee80211_local *local = key->local;
+ 
+ 	assert_key_lock(local);
+ 
++	set_sta_flag(sta, WLAN_STA_USES_ENCRYPTION);
++
+ 	sta->ptk_idx = key->conf.keyidx;
+ 
+-	if (!ieee80211_hw_check(&local->hw, AMPDU_KEYBORDER_SUPPORT))
++	if (force || !ieee80211_hw_check(&local->hw, AMPDU_KEYBORDER_SUPPORT))
+ 		clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
+ 	ieee80211_check_fast_xmit(sta);
+ 
+ 	return 0;
+ }
+ 
++int ieee80211_set_tx_key(struct ieee80211_key *key)
++{
++	return _ieee80211_set_tx_key(key, false);
++}
++
+ static void ieee80211_pairwise_rekey(struct ieee80211_key *old,
+ 				     struct ieee80211_key *new)
+ {
+@@ -441,11 +448,8 @@ static int ieee80211_key_replace(struct
+ 		if (pairwise) {
+ 			rcu_assign_pointer(sta->ptk[idx], new);
+ 			if (new &&
+-			    !(new->conf.flags & IEEE80211_KEY_FLAG_NO_AUTO_TX)) {
+-				sta->ptk_idx = idx;
+-				clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
+-				ieee80211_check_fast_xmit(sta);
+-			}
++			    !(new->conf.flags & IEEE80211_KEY_FLAG_NO_AUTO_TX))
++				_ieee80211_set_tx_key(new, true);
+ 		} else {
+ 			rcu_assign_pointer(sta->gtk[idx], new);
+ 		}
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -98,6 +98,7 @@ enum ieee80211_sta_info_flags {
+ 	WLAN_STA_MPSP_OWNER,
+ 	WLAN_STA_MPSP_RECIPIENT,
+ 	WLAN_STA_PS_DELIVER,
++	WLAN_STA_USES_ENCRYPTION,
+ 
+ 	NUM_WLAN_STA_FLAGS,
+ };
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -590,10 +590,13 @@ ieee80211_tx_h_select_key(struct ieee802
+ 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
+ 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
+ 
+-	if (unlikely(info->flags & IEEE80211_TX_INTFL_DONT_ENCRYPT))
++	if (unlikely(info->flags & IEEE80211_TX_INTFL_DONT_ENCRYPT)) {
+ 		tx->key = NULL;
+-	else if (tx->sta &&
+-		 (key = rcu_dereference(tx->sta->ptk[tx->sta->ptk_idx])))
++		return TX_CONTINUE;
++	}
++
++	if (tx->sta &&
++	    (key = rcu_dereference(tx->sta->ptk[tx->sta->ptk_idx])))
+ 		tx->key = key;
+ 	else if (ieee80211_is_group_privacy_action(tx->skb) &&
+ 		(key = rcu_dereference(tx->sdata->default_multicast_key)))
+@@ -654,6 +657,9 @@ ieee80211_tx_h_select_key(struct ieee802
+ 		if (!skip_hw && tx->key &&
+ 		    tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)
+ 			info->control.hw_key = &tx->key->conf;
++	} else if (!ieee80211_is_mgmt(hdr->frame_control) && tx->sta &&
++		   test_sta_flag(tx->sta, WLAN_STA_USES_ENCRYPTION)) {
++		return TX_DROP;
+ 	}
+ 
+ 	return TX_CONTINUE;

package/network/services/hostapd/Makefile

@@ -130,6 +130,7 @@ DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny
 define Package/hostapd/Default
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=WirelessAPD
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
   DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
@@ -191,6 +192,7 @@ endef
 define Package/wpad/Default
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=WirelessAPD
   TITLE:=IEEE 802.1x Authenticator/Supplicant
   DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
   URL:=http://hostap.epitest.fi/
@@ -280,6 +282,7 @@ Package/wpad-mesh-wolfssl/description = $(Package/wpad-mesh/description)
 define Package/wpa-supplicant/Default
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=WirelessAPD
   TITLE:=WPA Supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/
   DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
@@ -352,11 +355,13 @@ define Package/hostapd-common
   TITLE:=hostapd/wpa_supplicant common support files
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=WirelessAPD
 endef
 
 define Package/hostapd-utils
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=WirelessAPD
   TITLE:=IEEE 802.1x Authenticator (utils)
   URL:=http://hostap.epitest.fi/
   DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg)))
@@ -370,6 +375,7 @@ endef
 define Package/wpa-cli
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=WirelessAPD
   DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg)))
   TITLE:=WPA Supplicant command line control utility
 endef
@@ -377,6 +383,7 @@ endef
 define Package/eapol-test
   TITLE:=802.1x authentication test utility
   SECTION:=net
+  SUBMENU:=WirelessAPD
   CATEGORY:=Network
   VARIANT:=supplicant-full-internal
   DEPENDS:=$(DRV_DEPENDS) +libubus
@@ -386,6 +393,7 @@ define Package/eapol-test-openssl
   TITLE:=802.1x authentication test utility
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=WirelessAPD
   VARIANT:=supplicant-full-openssl
   CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS))
   DEPENDS:=$(DRV_DEPENDS) +libubus +libopenssl
@@ -396,6 +404,7 @@ define Package/eapol-test-wolfssl
   TITLE:=802.1x authentication test utility
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=WirelessAPD
   VARIANT:=supplicant-full-wolfssl
   CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS)))
   DEPENDS:=$(DRV_DEPENDS) +libubus +libwolfssl
@@ -517,9 +526,9 @@ define Install/supplicant
 endef
 
 define Package/hostapd-common/install
-	$(INSTALL_DIR) $(1)/lib/netifd $(1)/etc/rc.button $(1)/etc/hotplug.d/ieee80211
+	$(INSTALL_DIR) $(1)/lib/netifd $(1)/etc/rc.button $(1)/etc/hotplug.d/ieee80211 $(1)/etc/init.d
 	$(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/netifd/hostapd.sh
-	$(INSTALL_BIN) ./files/hostapd.hotplug $(1)/etc/hotplug.d/ieee80211/20-hostapd
+	$(INSTALL_BIN) ./files/wpad.init $(1)/etc/init.d/wpad
 	$(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps
 endef
 

package/network/services/hostapd/files/hostapd.hotplug

@@ -1,46 +0,0 @@
-#!/bin/sh
-
-initscript="$0"
-
-. /lib/functions.sh
-. /lib/functions/procd.sh
-
-cd /sys/class/ieee80211
-
-procd_lock() {
-	return 0
-}
-
-service_triggers() {
-	return 0
-}
-
-service_data() {
-	return 0
-}
-
-procd_open_service hostapd
-
-for phy in *; do
-	[ -d "$phy" ] || continue
-
-	mkdir -p /var/run/wpa_supplicant-$phy /var/run/hostapd-$phy
-
-	if [ -x "/usr/sbin/hostapd" ]; then
-		procd_open_instance hostapd-$phy
-		procd_set_param command /usr/sbin/hostapd -s -n $phy -g /var/run/hostapd-${phy}/global
-		procd_set_param CREATE_TIME="$(date -r $phy)" # force restart on recreated phy
-		procd_set_param respawn
-		procd_close_instance
-	fi
-
-	if [ -x "/usr/sbin/wpa_supplicant" ]; then
-		procd_open_instance supplicant-$phy
-		procd_set_param command /usr/sbin/wpa_supplicant -s -n $phy -g /var/run/wpa_supplicant-${phy}/global
-		procd_set_param CREATE_TIME="$(date -r $phy)" # force restart on recreated phy
-		procd_set_param respawn
-		procd_close_instance
-	fi
-done
-
-procd_close_service set

package/network/services/hostapd/files/wpad.init

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=19
+STOP=21
+
+USE_PROCD=1
+NAME=wpad
+
+start_service() {
+	if [ -x "/usr/sbin/hostapd" ]; then
+		mkdir -p /var/run/hostapd
+		procd_open_instance hostapd
+		procd_set_param command /usr/sbin/hostapd -s -g /var/run/hostapd/global
+		procd_set_param respawn
+		procd_close_instance
+	fi
+
+	if [ -x "/usr/sbin/wpa_supplicant" ]; then
+		mkdir -p /var/run/wpa_supplicant
+		procd_open_instance supplicant
+		procd_set_param command /usr/sbin/wpa_supplicant -n -s -g /var/run/wpa_supplicant/global
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}

package/network/services/hostapd/patches/600-ubus_support.patch

@@ -22,16 +22,15 @@
  
  #define OCE_STA_CFON_ENABLED(hapd) \
  	((hapd->conf->oce & OCE_STA_CFON) && \
-@@ -72,6 +73,8 @@ struct hapd_interfaces {
+@@ -72,6 +73,7 @@ struct hapd_interfaces {
  #ifdef CONFIG_DPP
  	struct dpp_global *dpp;
  #endif /* CONFIG_DPP */
 +	struct ubus_object ubus;
-+	char *name;
  };
  
  enum hostapd_chan_status {
-@@ -145,6 +148,7 @@ struct hostapd_data {
+@@ -145,6 +147,7 @@ struct hostapd_data {
  	struct hostapd_iface *iface;
  	struct hostapd_config *iconf;
  	struct hostapd_bss_config *conf;
@@ -39,7 +38,7 @@
  	int interface_added; /* virtual interface added for this BSS */
  	unsigned int started:1;
  	unsigned int disabled:1;
-@@ -580,6 +584,7 @@ hostapd_alloc_bss_data(struct hostapd_if
+@@ -580,6 +583,7 @@ hostapd_alloc_bss_data(struct hostapd_if
  		       struct hostapd_bss_config *bss);
  int hostapd_setup_interface(struct hostapd_iface *iface);
  int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err);
@@ -315,16 +314,7 @@
  	/* Remove interface from the global list of interfaces */
  	prev = global->ifaces;
  	if (prev == wpa_s) {
-@@ -6520,6 +6524,8 @@ struct wpa_global * wpa_supplicant_init(
+@@ -6626,8 +6630,12 @@ int wpa_supplicant_run(struct wpa_global
- 	if (params->override_ctrl_interface)
- 		global->params.override_ctrl_interface =
- 			os_strdup(params->override_ctrl_interface);
-+	if (params->name)
-+		global->params.name = os_strdup(params->name);
- #ifdef CONFIG_MATCH_IFACE
- 	global->params.match_iface_count = params->match_iface_count;
- 	if (params->match_iface_count) {
-@@ -6626,8 +6632,12 @@ int wpa_supplicant_run(struct wpa_global
  	eloop_register_signal_terminate(wpa_supplicant_terminate, global);
  	eloop_register_signal_reconfig(wpa_supplicant_reconfig, global);
  
@@ -337,14 +327,6 @@
  	return 0;
  }
  
-@@ -6687,6 +6697,7 @@ void wpa_supplicant_deinit(struct wpa_gl
- #ifdef CONFIG_MATCH_IFACE
- 	os_free(global->params.match_ifaces);
- #endif /* CONFIG_MATCH_IFACE */
-+	os_free(global->params.name);
- #ifdef CONFIG_P2P
- 	os_free(global->params.conf_p2p_dev);
- #endif /* CONFIG_P2P */
 --- a/wpa_supplicant/wpa_supplicant_i.h
 +++ b/wpa_supplicant/wpa_supplicant_i.h
 @@ -17,6 +17,7 @@
@@ -355,16 +337,7 @@
  
  extern const char *const wpa_supplicant_version;
  extern const char *const wpa_supplicant_license;
-@@ -246,6 +247,8 @@ struct wpa_params {
+@@ -306,6 +307,8 @@ struct wpa_global {
- 	 */
- 	int match_iface_count;
- #endif /* CONFIG_MATCH_IFACE */
-+
-+	char *name;
- };
- 
- struct p2p_srv_bonjour {
-@@ -306,6 +309,8 @@ struct wpa_global {
  #endif /* CONFIG_WIFI_DISPLAY */
  
  	struct psk_list_entry *add_psk; /* From group formation */
@@ -373,7 +346,7 @@
  };
  
  
-@@ -506,6 +511,7 @@ struct wpa_supplicant {
+@@ -506,6 +509,7 @@ struct wpa_supplicant {
  	unsigned char own_addr[ETH_ALEN];
  	unsigned char perm_addr[ETH_ALEN];
  	char ifname[100];
@@ -402,25 +375,7 @@
  
 --- a/hostapd/main.c
 +++ b/hostapd/main.c
-@@ -688,7 +688,7 @@ int main(int argc, char *argv[])
+@@ -894,6 +894,7 @@ int main(int argc, char *argv[])
- 	wpa_supplicant_event = hostapd_wpa_event;
- 	wpa_supplicant_event_global = hostapd_wpa_event_global;
- 	for (;;) {
--		c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:g:G:v::");
-+		c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:g:G:n:v::");
- 		if (c < 0)
- 			break;
- 		switch (c) {
-@@ -763,6 +763,8 @@ int main(int argc, char *argv[])
- 			if (hostapd_get_interface_names(&if_names,
- 							&if_names_size, optarg))
- 				goto out;
-+		case 'n':
-+			interfaces.name = optarg;
- 			break;
- 		default:
- 			usage();
-@@ -894,6 +896,7 @@ int main(int argc, char *argv[])
  	}
  
  	hostapd_global_ctrl_iface_init(&interfaces);
@@ -428,7 +383,7 @@
  
  	if (hostapd_global_run(&interfaces, daemonize, pid_file)) {
  		wpa_printf(MSG_ERROR, "Failed to start eloop");
-@@ -903,6 +906,7 @@ int main(int argc, char *argv[])
+@@ -903,6 +904,7 @@ int main(int argc, char *argv[])
  	ret = 0;
  
   out:
@@ -443,16 +398,15 @@
  	for (;;) {
  		c = getopt(argc, argv,
 -			   "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuv::W");
-+			   "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:n:No:O:p:P:qsTtuv::W");
++			   "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:nNo:O:p:P:qsTtuv::W");
  		if (c < 0)
  			break;
  		switch (c) {
-@@ -271,6 +271,10 @@ int main(int argc, char *argv[])
+@@ -271,6 +271,9 @@ int main(int argc, char *argv[])
  			params.conf_p2p_dev = optarg;
  			break;
  #endif /* CONFIG_P2P */
 +		case 'n':
-+			params.name = optarg;
 +			iface_count = 0;
 +			break;
  		case 'o':

package/network/services/hostapd/patches/700-wifi-reload.patch

@@ -1,7 +1,5 @@
-Index: hostapd-2019-08-08-ca8c2bd2/hostapd/config_file.c
+--- a/hostapd/config_file.c
-===================================================================
++++ b/hostapd/config_file.c
---- hostapd-2019-08-08-ca8c2bd2.orig/hostapd/config_file.c
-+++ hostapd-2019-08-08-ca8c2bd2/hostapd/config_file.c
 @@ -2470,6 +2470,8 @@ static int hostapd_config_fill(struct ho
  		bss->isolate = atoi(pos);
  	} else if (os_strcmp(buf, "ap_max_inactivity") == 0) {
@@ -20,10 +18,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/hostapd/config_file.c
  	} else if (os_strcmp(buf, "channel") == 0) {
  		if (os_strcmp(pos, "acs_survey") == 0) {
  #ifndef CONFIG_ACS
-Index: hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.c
+--- a/src/ap/ap_config.c
-===================================================================
++++ b/src/ap/ap_config.c
---- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/ap_config.c
-+++ hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.c
 @@ -698,6 +698,7 @@ void hostapd_config_free_bss(struct host
  	os_free(conf->radius_req_attr_sqlite);
  	os_free(conf->rsn_preauth_interfaces);
@@ -40,10 +36,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.c
  	os_free(conf->bss);
  	os_free(conf->supported_rates);
  	os_free(conf->basic_rates);
-Index: hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.h
+--- a/src/ap/ap_config.h
-===================================================================
++++ b/src/ap/ap_config.h
---- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/ap_config.h
-+++ hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.h
 @@ -829,6 +829,7 @@ struct hostapd_bss_config {
  	 */
  	u8 mka_psk_set;
@@ -60,10 +54,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/ap_config.h
  };
  
  
-Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.c
+--- a/src/ap/hostapd.c
-===================================================================
++++ b/src/ap/hostapd.c
---- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/hostapd.c
-+++ hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.c
 @@ -206,6 +206,10 @@ static int hostapd_iface_conf_changed(st
  {
  	size_t i;
@@ -150,10 +142,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.c
  	if (conf)
  		hapd->driver = conf->driver;
  	hapd->ctrl_sock = -1;
-Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
+--- a/src/ap/hostapd.h
-===================================================================
++++ b/src/ap/hostapd.h
---- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/hostapd.h
-+++ hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
 @@ -42,7 +42,7 @@ struct mesh_conf;
  struct hostapd_iface;
  
@@ -163,7 +153,7 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
  	struct hostapd_config * (*config_read_cb)(const char *config_fname);
  	int (*ctrl_iface_init)(struct hostapd_data *hapd);
  	void (*ctrl_iface_deinit)(struct hostapd_data *hapd);
-@@ -149,6 +149,7 @@ struct hostapd_data {
+@@ -148,6 +148,7 @@ struct hostapd_data {
  	struct hostapd_config *iconf;
  	struct hostapd_bss_config *conf;
  	struct hostapd_ubus_bss ubus;
@@ -171,7 +161,7 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
  	int interface_added; /* virtual interface added for this BSS */
  	unsigned int started:1;
  	unsigned int disabled:1;
-@@ -576,7 +577,7 @@ struct hostapd_iface {
+@@ -575,7 +576,7 @@ struct hostapd_iface {
  int hostapd_for_each_interface(struct hapd_interfaces *interfaces,
  			       int (*cb)(struct hostapd_iface *iface,
  					 void *ctx), void *ctx);
@@ -180,10 +170,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/ap/hostapd.h
  void hostapd_reconfig_encryption(struct hostapd_data *hapd);
  struct hostapd_data *
  hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface,
-Index: hostapd-2019-08-08-ca8c2bd2/src/drivers/driver_nl80211.c
+--- a/src/drivers/driver_nl80211.c
-===================================================================
++++ b/src/drivers/driver_nl80211.c
---- hostapd-2019-08-08-ca8c2bd2.orig/src/drivers/driver_nl80211.c
-+++ hostapd-2019-08-08-ca8c2bd2/src/drivers/driver_nl80211.c
 @@ -4295,6 +4295,9 @@ static int wpa_driver_nl80211_set_ap(voi
  	if (ret) {
  		wpa_printf(MSG_DEBUG, "nl80211: Beacon set failed: %d (%s)",
@@ -194,10 +182,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/src/drivers/driver_nl80211.c
  	} else {
  		bss->beacon_set = 1;
  		nl80211_set_bss(bss, params->cts_protect, params->preamble,
-Index: hostapd-2019-08-08-ca8c2bd2/hostapd/ctrl_iface.c
+--- a/hostapd/ctrl_iface.c
-===================================================================
++++ b/hostapd/ctrl_iface.c
---- hostapd-2019-08-08-ca8c2bd2.orig/hostapd/ctrl_iface.c
-+++ hostapd-2019-08-08-ca8c2bd2/hostapd/ctrl_iface.c
 @@ -182,7 +182,7 @@ static int hostapd_ctrl_iface_update(str
  	iface->interfaces->config_read_cb = hostapd_ctrl_iface_config_read;
  	reload_opts = txt;
@@ -207,10 +193,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/hostapd/ctrl_iface.c
  
  	iface->interfaces->config_read_cb = config_read_cb;
  }
-Index: hostapd-2019-08-08-ca8c2bd2/hostapd/main.c
+--- a/hostapd/main.c
-===================================================================
++++ b/hostapd/main.c
---- hostapd-2019-08-08-ca8c2bd2.orig/hostapd/main.c
-+++ hostapd-2019-08-08-ca8c2bd2/hostapd/main.c
 @@ -320,7 +320,7 @@ static void handle_term(int sig, void *s
  
  static int handle_reload_iface(struct hostapd_iface *iface, void *ctx)
@@ -220,10 +204,8 @@ Index: hostapd-2019-08-08-ca8c2bd2/hostapd/main.c
  		wpa_printf(MSG_WARNING, "Failed to read new configuration "
  			   "file - continuing with old.");
  	}
-Index: hostapd-2019-08-08-ca8c2bd2/src/ap/wps_hostapd.c
+--- a/src/ap/wps_hostapd.c
-===================================================================
++++ b/src/ap/wps_hostapd.c
---- hostapd-2019-08-08-ca8c2bd2.orig/src/ap/wps_hostapd.c
-+++ hostapd-2019-08-08-ca8c2bd2/src/ap/wps_hostapd.c
 @@ -275,7 +275,7 @@ static void wps_reload_config(void *eloo
  
  	wpa_printf(MSG_DEBUG, "WPS: Reload configuration data");

package/network/services/hostapd/src/src/ap/ubus.c

@@ -1115,24 +1115,12 @@ static struct ubus_object_type daemon_object_type =
 void hostapd_ubus_add(struct hapd_interfaces *interfaces)
 {
 	struct ubus_object *obj = &interfaces->ubus;
-	char *name;
-	int name_len;
 	int ret;
 
 	if (!hostapd_ubus_init())
 		return;
 
-	name_len = strlen("hostapd") + 1;
+	obj->name = strdup("hostapd");
-	if (interfaces->name)
-		name_len += strlen(interfaces->name) + 1;
-
-	name = malloc(name_len);
-	strcpy(name, "hostapd");
-	if (interfaces->name) {
-		strcat(name, ".");
-		strcat(name, interfaces->name);
-	}
-	obj->name = name;
 
 	obj->type = &daemon_object_type;
 	obj->methods = daemon_object_type.methods;

package/network/services/hostapd/src/wpa_supplicant/ubus.c

@@ -322,27 +322,12 @@ static struct ubus_object_type wpas_daemon_object_type =
 void wpas_ubus_add(struct wpa_global *global)
 {
 	struct ubus_object *obj = &global->ubus_global;
-	char *name;
-	int name_len;
 	int ret;
 
 	if (!wpas_ubus_init())
 		return;
 
-	name_len = strlen("wpa_supplicant") + 1;
+	obj->name = strdup("wpa_supplicant");
-	if (global->params.name)
-		name_len += strlen(global->params.name) + 1;
-
-	name = malloc(name_len);
-	strcpy(name, "wpa_supplicant");
-
-	if (global->params.name)
-	{
-		strcat(name, ".");
-		strcat(name, global->params.name);
-	}
-
-	obj->name = name;
 
 	obj->type = &wpas_daemon_object_type;
 	obj->methods = wpas_daemon_object_type.methods;

package/network/utils/iw/Makefile

@@ -8,14 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iw
-PKG_VERSION:=4.14
+PKG_VERSION:=5.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/network/iw
-PKG_HASH:=f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89
+PKG_HASH:=a2469f677088d7b1070a7fbb28f3c747041697e8f6ec70783339cb1bc27a395f
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/iw-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
 

package/network/utils/iw/patches/001-nl80211_h_sync.patch

@@ -1,629 +1,41 @@
-diff --git a/nl80211.h b/nl80211.h
-index c587a61..255a971 100644
 --- a/nl80211.h
 +++ b/nl80211.h
-@@ -11,6 +11,7 @@
+@@ -2373,6 +2373,9 @@ enum nl80211_commands {
-  * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
+  *	the allowed channel bandwidth configurations. (u8 attribute)
-  * Copyright 2008 Colin McCabe <colin@cozybit.com>
+  *	Defined by IEEE P802.11ay/D4.0 section 9.4.2.251, Table 13.
-  * Copyright 2015-2017	Intel Deutschland GmbH
-+ * Copyright (C) 2018 Intel Corporation
   *
-  * Permission to use, copy, modify, and/or distribute this software for any
-  * purpose with or without fee is hereby granted, provided that the above
-@@ -203,7 +204,8 @@
-  * FILS shared key authentication offload should be able to construct the
-  * authentication and association frames for FILS shared key authentication and
-  * eventually do a key derivation as per IEEE 802.11ai. The below additional
-- * parameters should be given to driver in %NL80211_CMD_CONNECT.
-+ * parameters should be given to driver in %NL80211_CMD_CONNECT and/or in
-+ * %NL80211_CMD_UPDATE_CONNECT_PARAMS.
-  *	%NL80211_ATTR_FILS_ERP_USERNAME - used to construct keyname_nai
-  *	%NL80211_ATTR_FILS_ERP_REALM - used to construct keyname_nai
-  *	%NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM - used to construct erp message
-@@ -214,7 +216,8 @@
-  * as specified in IETF RFC 6696.
-  *
-  * When FILS shared key authentication is completed, driver needs to provide the
-- * below additional parameters to userspace.
-+ * below additional parameters to userspace, which can be either after setting
-+ * up a connection or after roaming.
-  *	%NL80211_ATTR_FILS_KEK - used for key renewal
-  *	%NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM - used in further EAP-RP exchanges
-  *	%NL80211_ATTR_PMKID - used to identify the PMKSA used/generated
-@@ -542,7 +545,8 @@
-  *	IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
-  *	%NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
-  *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
-- *	%NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and
-+ *	%NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
-+ *	%NL80211_ATTR_CONTROL_PORT_OVER_NL80211, %NL80211_ATTR_MAC_HINT, and
-  *	%NL80211_ATTR_WIPHY_FREQ_HINT.
-  *	If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are
-  *	restrictions on BSS selection, i.e., they effectively prevent roaming
-@@ -977,21 +981,58 @@
-  *	only the %NL80211_ATTR_IE data is used and updated with this command.
-  *
-  * @NL80211_CMD_SET_PMK: For offloaded 4-Way handshake, set the PMK or PMK-R0
-- *	for the given authenticator address (specified with &NL80211_ATTR_MAC).
-- *	When &NL80211_ATTR_PMKR0_NAME is set, &NL80211_ATTR_PMK specifies the
-+ *	for the given authenticator address (specified with %NL80211_ATTR_MAC).
-+ *	When %NL80211_ATTR_PMKR0_NAME is set, %NL80211_ATTR_PMK specifies the
-  *	PMK-R0, otherwise it specifies the PMK.
-  * @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously
-  *	configured PMK for the authenticator address identified by
-- *	&NL80211_ATTR_MAC.
-+ *	%NL80211_ATTR_MAC.
-  * @NL80211_CMD_PORT_AUTHORIZED: An event that indicates that the 4 way
-  *	handshake was completed successfully by the driver. The BSSID is
-- *	specified with &NL80211_ATTR_MAC. Drivers that support 4 way handshake
-+ *	specified with %NL80211_ATTR_MAC. Drivers that support 4 way handshake
-  *	offload should send this event after indicating 802.11 association with
-- *	&NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed
-- *	&NL80211_CMD_DISCONNECT should be indicated instead.
-+ *	%NL80211_CMD_CONNECT or %NL80211_CMD_ROAM. If the 4 way handshake failed
-+ *	%NL80211_CMD_DISCONNECT should be indicated instead.
-+ *
-+ * @NL80211_CMD_CONTROL_PORT_FRAME: Control Port (e.g. PAE) frame TX request
-+ *	and RX notification.  This command is used both as a request to transmit
-+ *	a control port frame and as a notification that a control port frame
-+ *	has been received. %NL80211_ATTR_FRAME is used to specify the
-+ *	frame contents.  The frame is the raw EAPoL data, without ethernet or
-+ *	802.11 headers.
-+ *	When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
-+ *	%NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added
-+ *	indicating the protocol type of the received frame; whether the frame
-+ *	was received unencrypted and the MAC address of the peer respectively.
-  *
-  * @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded.
-  *
-+ * @NL80211_CMD_EXTERNAL_AUTH: This interface is exclusively defined for host
-+ *	drivers that do not define separate commands for authentication and
-+ *	association, but rely on user space for the authentication to happen.
-+ *	This interface acts both as the event request (driver to user space)
-+ *	to trigger the authentication and command response (userspace to
-+ *	driver) to indicate the authentication status.
-+ *
-+ *	User space uses the %NL80211_CMD_CONNECT command to the host driver to
-+ *	trigger a connection. The host driver selects a BSS and further uses
-+ *	this interface to offload only the authentication part to the user
-+ *	space. Authentication frames are passed between the driver and user
-+ *	space through the %NL80211_CMD_FRAME interface. Host driver proceeds
-+ *	further with the association after getting successful authentication
-+ *	status. User space indicates the authentication status through
-+ *	%NL80211_ATTR_STATUS_CODE attribute in %NL80211_CMD_EXTERNAL_AUTH
-+ *	command interface.
-+ *
-+ *	Host driver reports this status on an authentication failure to the
-+ *	user space through the connect result as the user space would have
-+ *	initiated the connection through the connect request.
-+ *
-+ * @NL80211_CMD_STA_OPMODE_CHANGED: An event that notify station's
-+ *	ht opmode or vht opmode changes using any of %NL80211_ATTR_SMPS_MODE,
-+ *	%NL80211_ATTR_CHANNEL_WIDTH,%NL80211_ATTR_NSS attributes with its
-+ *	address(specified in %NL80211_ATTR_MAC).
-+ *
-  * @NL80211_CMD_MAX: highest used command number
-  * @__NL80211_CMD_AFTER_LAST: internal use
-  */
-@@ -1198,6 +1239,12 @@ enum nl80211_commands {
- 
- 	NL80211_CMD_RELOAD_REGDB,
- 
-+	NL80211_CMD_EXTERNAL_AUTH,
-+
-+	NL80211_CMD_STA_OPMODE_CHANGED,
-+
-+	NL80211_CMD_CONTROL_PORT_FRAME,
-+
- 	/* add new commands above here */
- 
- 	/* used to define NL80211_CMD_MAX below */
-@@ -1445,6 +1492,15 @@ enum nl80211_commands {
-  * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
-  *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
-  *	ethertype frames used for key negotiation must not be encrypted.
-+ * @NL80211_ATTR_CONTROL_PORT_OVER_NL80211: A flag indicating whether control
-+ *	port frames (e.g. of type given in %NL80211_ATTR_CONTROL_PORT_ETHERTYPE)
-+ *	will be sent directly to the network interface or sent via the NL80211
-+ *	socket.  If this attribute is missing, then legacy behavior of sending
-+ *	control port frames directly to the network interface is used.  If the
-+ *	flag is included, then control port frames are sent over NL80211 instead
-+ *	using %CMD_CONTROL_PORT_FRAME.  If control port routing over NL80211 is
-+ *	to be used then userspace must also use the %NL80211_ATTR_SOCKET_OWNER
-+ *	flag.
-  *
-  * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
-  *	We recommend using nested, driver-specific attributes within this.
-@@ -1932,6 +1988,12 @@ enum nl80211_commands {
-  *	multicast group.
-  *	If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the
-  *	station will deauthenticate when the socket is closed.
-+ *	If set during %NL80211_CMD_JOIN_IBSS the IBSS will be automatically
-+ *	torn down when the socket is closed.
-+ *	If set during %NL80211_CMD_JOIN_MESH the mesh setup will be
-+ *	automatically torn down when the socket is closed.
-+ *	If set during %NL80211_CMD_START_AP the AP will be automatically
-+ *	disabled when the socket is closed.
-  *
-  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
-  *	the TDLS link initiator.
-@@ -2153,6 +2215,35 @@ enum nl80211_commands {
-  * @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.
-  * @NL80211_ATTR_PORT_AUTHORIZED: (reserved)
-  *
-+ * @NL80211_ATTR_EXTERNAL_AUTH_ACTION: Identify the requested external
-+ *     authentication operation (u32 attribute with an
-+ *     &enum nl80211_external_auth_action value). This is used with the
-+ *     %NL80211_CMD_EXTERNAL_AUTH request event.
-+ * @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user
-+ *     space supports external authentication. This attribute shall be used
-+ *     only with %NL80211_CMD_CONNECT request. The driver may offload
-+ *     authentication processing to user space if this capability is indicated
-+ *     in NL80211_CMD_CONNECT requests from the user space.
-+ *
-+ * @NL80211_ATTR_NSS: Station's New/updated  RX_NSS value notified using this
-+ *	u8 attribute. This is used with %NL80211_CMD_STA_OPMODE_CHANGED.
-+ *
-+ * @NL80211_ATTR_TXQ_STATS: TXQ statistics (nested attribute, see &enum
-+ *      nl80211_txq_stats)
-+ * @NL80211_ATTR_TXQ_LIMIT: Total packet limit for the TXQ queues for this phy.
-+ *      The smaller of this and the memory limit is enforced.
-+ * @NL80211_ATTR_TXQ_MEMORY_LIMIT: Total memory memory limit (in bytes) for the
-+ *      TXQ queues for this phy. The smaller of this and the packet limit is
-+ *      enforced.
-+ * @NL80211_ATTR_TXQ_QUANTUM: TXQ scheduler quantum (bytes). Number of bytes
-+ *      a flow is assigned on each round of the DRR scheduler.
-+ * @NL80211_ATTR_HE_CAPABILITY: HE Capability information element (from
-+ *	association request when used with NL80211_CMD_NEW_STATION). Can be set
-+ *	only if %NL80211_STA_FLAG_WME is set.
-+ *
 + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
 + *	transmit power to stay within regulatory limits. u32, dBi.
 + *
   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
   * @NL80211_ATTR_MAX: highest attribute number currently defined
   * @__NL80211_ATTR_AFTER_LAST: internal use
-@@ -2579,6 +2670,23 @@ enum nl80211_attrs {
+@@ -2835,6 +2838,8 @@ enum nl80211_attrs {
- 	NL80211_ATTR_PMKR0_NAME,
+ 	NL80211_ATTR_WIPHY_EDMG_CHANNELS,
- 	NL80211_ATTR_PORT_AUTHORIZED,
+ 	NL80211_ATTR_WIPHY_EDMG_BW_CONFIG,
  
-+	NL80211_ATTR_EXTERNAL_AUTH_ACTION,
-+	NL80211_ATTR_EXTERNAL_AUTH_SUPPORT,
-+
-+	NL80211_ATTR_NSS,
-+	NL80211_ATTR_ACK_SIGNAL,
-+
-+	NL80211_ATTR_CONTROL_PORT_OVER_NL80211,
-+
-+	NL80211_ATTR_TXQ_STATS,
-+	NL80211_ATTR_TXQ_LIMIT,
-+	NL80211_ATTR_TXQ_MEMORY_LIMIT,
-+	NL80211_ATTR_TXQ_QUANTUM,
-+
-+	NL80211_ATTR_HE_CAPABILITY,
-+
 +	NL80211_ATTR_WIPHY_ANTENNA_GAIN,
 +
  	/* add attributes here, update the policy in nl80211.c */
  
  	__NL80211_ATTR_AFTER_LAST,
-@@ -2618,6 +2726,8 @@ enum nl80211_attrs {
+@@ -5484,6 +5489,10 @@ enum nl80211_feature_flags {
- #define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
+  * @NL80211_EXT_FEATURE_SAE_OFFLOAD: Device wants to do SAE authentication in
- #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS
+  *	station mode (SAE password is passed as part of the connect command).
- 
-+#define NL80211_WIPHY_NAME_MAXLEN		64
-+
- #define NL80211_MAX_SUPP_RATES			32
- #define NL80211_MAX_SUPP_HT_RATES		77
- #define NL80211_MAX_SUPP_REG_RULES		64
-@@ -2626,7 +2736,8 @@ enum nl80211_attrs {
- #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY	24
- #define NL80211_HT_CAPABILITY_LEN		26
- #define NL80211_VHT_CAPABILITY_LEN		12
--
-+#define NL80211_HE_MIN_CAPABILITY_LEN           16
-+#define NL80211_HE_MAX_CAPABILITY_LEN           51
- #define NL80211_MAX_NR_CIPHER_SUITES		5
- #define NL80211_MAX_NR_AKM_SUITES		2
- 
-@@ -2754,6 +2865,38 @@ struct nl80211_sta_flag_update {
- } __attribute__((packed));
- 
- /**
-+ * enum nl80211_he_gi - HE guard interval
-+ * @NL80211_RATE_INFO_HE_GI_0_8: 0.8 usec
-+ * @NL80211_RATE_INFO_HE_GI_1_6: 1.6 usec
-+ * @NL80211_RATE_INFO_HE_GI_3_2: 3.2 usec
-+ */
-+enum nl80211_he_gi {
-+	NL80211_RATE_INFO_HE_GI_0_8,
-+	NL80211_RATE_INFO_HE_GI_1_6,
-+	NL80211_RATE_INFO_HE_GI_3_2,
-+};
-+
-+/**
-+ * enum nl80211_he_ru_alloc - HE RU allocation values
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_26: 26-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_52: 52-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_106: 106-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_242: 242-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_484: 484-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_996: 996-tone RU allocation
-+ * @NL80211_RATE_INFO_HE_RU_ALLOC_2x996: 2x996-tone RU allocation
-+ */
-+enum nl80211_he_ru_alloc {
-+	NL80211_RATE_INFO_HE_RU_ALLOC_26,
-+	NL80211_RATE_INFO_HE_RU_ALLOC_52,
-+	NL80211_RATE_INFO_HE_RU_ALLOC_106,
-+	NL80211_RATE_INFO_HE_RU_ALLOC_242,
-+	NL80211_RATE_INFO_HE_RU_ALLOC_484,
-+	NL80211_RATE_INFO_HE_RU_ALLOC_996,
-+	NL80211_RATE_INFO_HE_RU_ALLOC_2x996,
-+};
-+
-+/**
-  * enum nl80211_rate_info - bitrate information
   *
-  * These attribute types are used with %NL80211_STA_INFO_TXRATE
++ * @NL80211_EXT_FEATURE_AQL: The driver supports the Airtime Queue Limit (AQL)
-@@ -2785,6 +2928,13 @@ struct nl80211_sta_flag_update {
++ *	feature, which prevents bufferbloat by using the expected transmission
-  * @NL80211_RATE_INFO_5_MHZ_WIDTH: 5 MHz width - note that this is
++ *	time to limit the amount of data buffered in the hardware.
-  *	a legacy rate and will be reported as the actual bitrate, i.e.
-  *	a quarter of the base (20 MHz) rate
-+ * @NL80211_RATE_INFO_HE_MCS: HE MCS index (u8, 0-11)
-+ * @NL80211_RATE_INFO_HE_NSS: HE NSS value (u8, 1-8)
-+ * @NL80211_RATE_INFO_HE_GI: HE guard interval identifier
-+ *	(u8, see &enum nl80211_he_gi)
-+ * @NL80211_RATE_INFO_HE_DCM: HE DCM value (u8, 0/1)
-+ * @NL80211_RATE_INFO_RU_ALLOC: HE RU allocation, if not present then
-+ *	non-OFDMA was used (u8, see &enum nl80211_he_ru_alloc)
-  * @__NL80211_RATE_INFO_AFTER_LAST: internal use
-  */
- enum nl80211_rate_info {
-@@ -2801,6 +2951,11 @@ enum nl80211_rate_info {
- 	NL80211_RATE_INFO_160_MHZ_WIDTH,
- 	NL80211_RATE_INFO_10_MHZ_WIDTH,
- 	NL80211_RATE_INFO_5_MHZ_WIDTH,
-+	NL80211_RATE_INFO_HE_MCS,
-+	NL80211_RATE_INFO_HE_NSS,
-+	NL80211_RATE_INFO_HE_GI,
-+	NL80211_RATE_INFO_HE_DCM,
-+	NL80211_RATE_INFO_HE_RU_ALLOC,
- 
- 	/* keep last */
- 	__NL80211_RATE_INFO_AFTER_LAST,
-@@ -2899,6 +3054,9 @@ enum nl80211_sta_bss_param {
-  * @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames
-  *	received from the station (u64, usec)
-  * @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
-+ * @NL80211_STA_INFO_ACK_SIGNAL: signal strength of the last ACK frame(u8, dBm)
-+ * @NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG: avg signal strength of (data)
-+ *	ACK frame (s8, dBm)
-  * @__NL80211_STA_INFO_AFTER_LAST: internal
-  * @NL80211_STA_INFO_MAX: highest possible station info attribute
-  */
-@@ -2937,6 +3095,8 @@ enum nl80211_sta_info {
- 	NL80211_STA_INFO_TID_STATS,
- 	NL80211_STA_INFO_RX_DURATION,
- 	NL80211_STA_INFO_PAD,
-+	NL80211_STA_INFO_ACK_SIGNAL,
-+	NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG,
- 
- 	/* keep last */
- 	__NL80211_STA_INFO_AFTER_LAST,
-@@ -2954,6 +3114,7 @@ enum nl80211_sta_info {
-  * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
-  *	MSDUs (u64)
-  * @NL80211_TID_STATS_PAD: attribute used for padding for 64-bit alignment
-+ * @NL80211_TID_STATS_TXQ_STATS: TXQ stats (nested attribute)
-  * @NUM_NL80211_TID_STATS: number of attributes here
-  * @NL80211_TID_STATS_MAX: highest numbered attribute here
-  */
-@@ -2964,6 +3125,7 @@ enum nl80211_tid_stats {
- 	NL80211_TID_STATS_TX_MSDU_RETRIES,
- 	NL80211_TID_STATS_TX_MSDU_FAILED,
- 	NL80211_TID_STATS_PAD,
-+	NL80211_TID_STATS_TXQ_STATS,
- 
- 	/* keep last */
- 	NUM_NL80211_TID_STATS,
-@@ -2971,6 +3133,44 @@ enum nl80211_tid_stats {
- };
- 
- /**
-+ * enum nl80211_txq_stats - per TXQ statistics attributes
-+ * @__NL80211_TXQ_STATS_INVALID: attribute number 0 is reserved
-+ * @NUM_NL80211_TXQ_STATS: number of attributes here
-+ * @NL80211_TXQ_STATS_BACKLOG_BYTES: number of bytes currently backlogged
-+ * @NL80211_TXQ_STATS_BACKLOG_PACKETS: number of packets currently
-+ *      backlogged
-+ * @NL80211_TXQ_STATS_FLOWS: total number of new flows seen
-+ * @NL80211_TXQ_STATS_DROPS: total number of packet drops
-+ * @NL80211_TXQ_STATS_ECN_MARKS: total number of packet ECN marks
-+ * @NL80211_TXQ_STATS_OVERLIMIT: number of drops due to queue space overflow
-+ * @NL80211_TXQ_STATS_OVERMEMORY: number of drops due to memory limit overflow
-+ *      (only for per-phy stats)
-+ * @NL80211_TXQ_STATS_COLLISIONS: number of hash collisions
-+ * @NL80211_TXQ_STATS_TX_BYTES: total number of bytes dequeued from TXQ
-+ * @NL80211_TXQ_STATS_TX_PACKETS: total number of packets dequeued from TXQ
-+ * @NL80211_TXQ_STATS_MAX_FLOWS: number of flow buckets for PHY
-+ * @NL80211_TXQ_STATS_MAX: highest numbered attribute here
-+ */
-+enum nl80211_txq_stats {
-+	__NL80211_TXQ_STATS_INVALID,
-+	NL80211_TXQ_STATS_BACKLOG_BYTES,
-+	NL80211_TXQ_STATS_BACKLOG_PACKETS,
-+	NL80211_TXQ_STATS_FLOWS,
-+	NL80211_TXQ_STATS_DROPS,
-+	NL80211_TXQ_STATS_ECN_MARKS,
-+	NL80211_TXQ_STATS_OVERLIMIT,
-+	NL80211_TXQ_STATS_OVERMEMORY,
-+	NL80211_TXQ_STATS_COLLISIONS,
-+	NL80211_TXQ_STATS_TX_BYTES,
-+	NL80211_TXQ_STATS_TX_PACKETS,
-+	NL80211_TXQ_STATS_MAX_FLOWS,
-+
-+	/* keep last */
-+	NUM_NL80211_TXQ_STATS,
-+	NL80211_TXQ_STATS_MAX = NUM_NL80211_TXQ_STATS - 1
-+};
-+
-+/**
-  * enum nl80211_mpath_flags - nl80211 mesh path flags
-  *
-  * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
-@@ -3022,6 +3222,38 @@ enum nl80211_mpath_info {
- };
- 
- /**
-+ * enum nl80211_band_iftype_attr - Interface type data attributes
 + *
-+ * @__NL80211_BAND_IFTYPE_ATTR_INVALID: attribute number 0 is reserved
-+ * @NL80211_BAND_IFTYPE_ATTR_IFTYPES: nested attribute containing a flag attribute
-+ *     for each interface type that supports the band data
-+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC: HE MAC capabilities as in HE
-+ *     capabilities IE
-+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY: HE PHY capabilities as in HE
-+ *     capabilities IE
-+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET: HE supported NSS/MCS as in HE
-+ *     capabilities IE
-+ * @NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE: HE PPE thresholds information as
-+ *     defined in HE capabilities IE
-+ * @NL80211_BAND_IFTYPE_ATTR_MAX: highest band HE capability attribute currently
-+ *     defined
-+ * @__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST: internal use
-+ */
-+enum nl80211_band_iftype_attr {
-+	__NL80211_BAND_IFTYPE_ATTR_INVALID,
-+
-+	NL80211_BAND_IFTYPE_ATTR_IFTYPES,
-+	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC,
-+	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY,
-+	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET,
-+	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE,
-+
-+	/* keep last */
-+	__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST,
-+	NL80211_BAND_IFTYPE_ATTR_MAX = __NL80211_BAND_IFTYPE_ATTR_AFTER_LAST - 1
-+};
-+
-+/**
-  * enum nl80211_band_attr - band attributes
-  * @__NL80211_BAND_ATTR_INVALID: attribute number 0 is reserved
-  * @NL80211_BAND_ATTR_FREQS: supported frequencies in this band,
-@@ -3036,6 +3268,8 @@ enum nl80211_mpath_info {
-  * @NL80211_BAND_ATTR_VHT_MCS_SET: 32-byte attribute containing the MCS set as
-  *	defined in 802.11ac
-  * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE
-+ * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each entry using
-+ *	attributes from &enum nl80211_band_iftype_attr
-  * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined
-  * @__NL80211_BAND_ATTR_AFTER_LAST: internal use
-  */
-@@ -3051,6 +3285,7 @@ enum nl80211_band_attr {
- 
- 	NL80211_BAND_ATTR_VHT_MCS_SET,
- 	NL80211_BAND_ATTR_VHT_CAPA,
-+	NL80211_BAND_ATTR_IFTYPE_DATA,
- 
- 	/* keep last */
- 	__NL80211_BAND_ATTR_AFTER_LAST,
-@@ -3060,6 +3295,29 @@ enum nl80211_band_attr {
- #define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
- 
- /**
-+ * enum nl80211_wmm_rule - regulatory wmm rule
-+ *
-+ * @__NL80211_WMMR_INVALID: attribute number 0 is reserved
-+ * @NL80211_WMMR_CW_MIN: Minimum contention window slot.
-+ * @NL80211_WMMR_CW_MAX: Maximum contention window slot.
-+ * @NL80211_WMMR_AIFSN: Arbitration Inter Frame Space.
-+ * @NL80211_WMMR_TXOP: Maximum allowed tx operation time.
-+ * @nl80211_WMMR_MAX: highest possible wmm rule.
-+ * @__NL80211_WMMR_LAST: Internal use.
-+ */
-+enum nl80211_wmm_rule {
-+	__NL80211_WMMR_INVALID,
-+	NL80211_WMMR_CW_MIN,
-+	NL80211_WMMR_CW_MAX,
-+	NL80211_WMMR_AIFSN,
-+	NL80211_WMMR_TXOP,
-+
-+	/* keep last */
-+	__NL80211_WMMR_LAST,
-+	NL80211_WMMR_MAX = __NL80211_WMMR_LAST - 1
-+};
-+
-+/**
-  * enum nl80211_frequency_attr - frequency attributes
-  * @__NL80211_FREQUENCY_ATTR_INVALID: attribute number 0 is reserved
-  * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
-@@ -3108,6 +3366,9 @@ enum nl80211_band_attr {
-  *	on this channel in current regulatory domain.
-  * @NL80211_FREQUENCY_ATTR_NO_10MHZ: 10 MHz operation is not allowed
-  *	on this channel in current regulatory domain.
-+ * @NL80211_FREQUENCY_ATTR_WMM: this channel has wmm limitations.
-+ *	This is a nested attribute that contains the wmm limitation per AC.
-+ *	(see &enum nl80211_wmm_rule)
-  * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
-  *	currently defined
-  * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
-@@ -3136,6 +3397,7 @@ enum nl80211_frequency_attr {
- 	NL80211_FREQUENCY_ATTR_IR_CONCURRENT,
- 	NL80211_FREQUENCY_ATTR_NO_20MHZ,
- 	NL80211_FREQUENCY_ATTR_NO_10MHZ,
-+	NL80211_FREQUENCY_ATTR_WMM,
- 
- 	/* keep last */
- 	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
-@@ -3319,7 +3581,7 @@ enum nl80211_sched_scan_match_attr {
-  * @NL80211_RRF_AUTO_BW: maximum available bandwidth should be calculated
-  *	base on contiguous rules and wider channels will be allowed to cross
-  *	multiple contiguous/overlapping frequency ranges.
-- * @NL80211_RRF_IR_CONCURRENT: See &NL80211_FREQUENCY_ATTR_IR_CONCURRENT
-+ * @NL80211_RRF_IR_CONCURRENT: See %NL80211_FREQUENCY_ATTR_IR_CONCURRENT
-  * @NL80211_RRF_NO_HT40MINUS: channels can't be used in HT40- operation
-  * @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation
-  * @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed
-@@ -4945,6 +5207,27 @@ enum nl80211_feature_flags {
-  *	probe request tx deferral and suppression
-  * @NL80211_EXT_FEATURE_MFP_OPTIONAL: Driver supports the %NL80211_MFP_OPTIONAL
-  *	value in %NL80211_ATTR_USE_MFP.
-+ * @NL80211_EXT_FEATURE_LOW_SPAN_SCAN: Driver supports low span scan.
-+ * @NL80211_EXT_FEATURE_LOW_POWER_SCAN: Driver supports low power scan.
-+ * @NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN: Driver supports high accuracy scan.
-+ * @NL80211_EXT_FEATURE_DFS_OFFLOAD: HW/driver will offload DFS actions.
-+ *	Device or driver will do all DFS-related actions by itself,
-+ *	informing user-space about CAC progress, radar detection event,
-+ *	channel change triggered by radar detection event.
-+ *	No need to start CAC from user-space, no need to react to
-+ *	"radar detected" event.
-+ * @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211: Driver supports sending and
-+ *	receiving control port frames over nl80211 instead of the netdevice.
-+ * @NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT: This Driver support data ack
-+ *	rssi if firmware support, this flag is to intimate about ack rssi
-+ *	support to nl80211.
-+ * @NL80211_EXT_FEATURE_TXQS: Driver supports FQ-CoDel-enabled intermediate
-+ *      TXQs.
-+ * @NL80211_EXT_FEATURE_SCAN_RANDOM_SN: Driver/device supports randomizing the
-+ *	SN in probe request frames if requested by %NL80211_SCAN_FLAG_RANDOM_SN.
-+ * @NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT: Driver/device can omit all data
-+ *	except for supported rates from the probe request content if requested
-+ *	by the %NL80211_SCAN_FLAG_MIN_PREQ_CONTENT flag.
-  *
   * @NUM_NL80211_EXT_FEATURES: number of extended features.
   * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
-@@ -4972,6 +5255,15 @@ enum nl80211_ext_feature_index {
+  */
- 	NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE,
+@@ -5529,6 +5538,8 @@ enum nl80211_ext_feature_index {
- 	NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION,
+ 	NL80211_EXT_FEATURE_EXT_KEY_ID,
- 	NL80211_EXT_FEATURE_MFP_OPTIONAL,
+ 	NL80211_EXT_FEATURE_STA_TX_PWR,
-+	NL80211_EXT_FEATURE_LOW_SPAN_SCAN,
+ 	NL80211_EXT_FEATURE_SAE_OFFLOAD,
-+	NL80211_EXT_FEATURE_LOW_POWER_SCAN,
++	NL80211_EXT_FEATURE_VLAN_OFFLOAD,
-+	NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN,
++	NL80211_EXT_FEATURE_AQL,
-+	NL80211_EXT_FEATURE_DFS_OFFLOAD,
-+	NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211,
-+	NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT,
-+	NL80211_EXT_FEATURE_TXQS,
-+	NL80211_EXT_FEATURE_SCAN_RANDOM_SN,
-+	NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,
  
  	/* add new features before the definition below */
  	NUM_NL80211_EXT_FEATURES,
-@@ -5032,6 +5324,10 @@ enum nl80211_timeout_reason {
-  * of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN
-  * requests.
-  *
-+ * NL80211_SCAN_FLAG_LOW_SPAN, NL80211_SCAN_FLAG_LOW_POWER, and
-+ * NL80211_SCAN_FLAG_HIGH_ACCURACY flags are exclusive of each other, i.e., only
-+ * one of them can be used in the request.
-+ *
-  * @NL80211_SCAN_FLAG_LOW_PRIORITY: scan request has low priority
-  * @NL80211_SCAN_FLAG_FLUSH: flush cache before scanning
-  * @NL80211_SCAN_FLAG_AP: force a scan even if the interface is configured
-@@ -5059,7 +5355,26 @@ enum nl80211_timeout_reason {
-  *	and suppression (if it has received a broadcast Probe Response frame,
-  *	Beacon frame or FILS Discovery frame from an AP that the STA considers
-  *	a suitable candidate for (re-)association - suitable in terms of
-- *	SSID and/or RSSI
-+ *	SSID and/or RSSI.
-+ * @NL80211_SCAN_FLAG_LOW_SPAN: Span corresponds to the total time taken to
-+ *	accomplish the scan. Thus, this flag intends the driver to perform the
-+ *	scan request with lesser span/duration. It is specific to the driver
-+ *	implementations on how this is accomplished. Scan accuracy may get
-+ *	impacted with this flag.
-+ * @NL80211_SCAN_FLAG_LOW_POWER: This flag intends the scan attempts to consume
-+ *	optimal possible power. Drivers can resort to their specific means to
-+ *	optimize the power. Scan accuracy may get impacted with this flag.
-+ * @NL80211_SCAN_FLAG_HIGH_ACCURACY: Accuracy here intends to the extent of scan
-+ *	results obtained. Thus HIGH_ACCURACY scan flag aims to get maximum
-+ *	possible scan results. This flag hints the driver to use the best
-+ *	possible scan configuration to improve the accuracy in scanning.
-+ *	Latency and power use may get impacted with this flag.
-+ * @NL80211_SCAN_FLAG_RANDOM_SN: randomize the sequence number in probe
-+ *	request frames from this scan to avoid correlation/tracking being
-+ *	possible.
-+ * @NL80211_SCAN_FLAG_MIN_PREQ_CONTENT: minimize probe request content to
-+ *	only have supported rates and no additional capabilities (unless
-+ *	added by userspace explicitly.)
-  */
- enum nl80211_scan_flags {
- 	NL80211_SCAN_FLAG_LOW_PRIORITY				= 1<<0,
-@@ -5070,6 +5385,11 @@ enum nl80211_scan_flags {
- 	NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP		= 1<<5,
- 	NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE		= 1<<6,
- 	NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION	= 1<<7,
-+	NL80211_SCAN_FLAG_LOW_SPAN				= 1<<8,
-+	NL80211_SCAN_FLAG_LOW_POWER				= 1<<9,
-+	NL80211_SCAN_FLAG_HIGH_ACCURACY				= 1<<10,
-+	NL80211_SCAN_FLAG_RANDOM_SN				= 1<<11,
-+	NL80211_SCAN_FLAG_MIN_PREQ_CONTENT			= 1<<12,
- };
- 
- /**
-@@ -5127,6 +5447,8 @@ enum nl80211_smps_mode {
-  *	non-operating channel is expired and no longer valid. New CAC must
-  *	be done on this channel before starting the operation. This is not
-  *	applicable for ETSI dfs domain where pre-CAC is valid for ever.
-+ * @NL80211_RADAR_CAC_STARTED: Channel Availability Check has been started,
-+ *	should be generated by HW if NL80211_EXT_FEATURE_DFS_OFFLOAD is enabled.
-  */
- enum nl80211_radar_event {
- 	NL80211_RADAR_DETECTED,
-@@ -5134,6 +5456,7 @@ enum nl80211_radar_event {
- 	NL80211_RADAR_CAC_ABORTED,
- 	NL80211_RADAR_NOP_FINISHED,
- 	NL80211_RADAR_PRE_CAC_EXPIRED,
-+	NL80211_RADAR_CAC_STARTED,
- };
- 
- /**
-@@ -5425,11 +5748,11 @@ enum nl80211_nan_func_attributes {
-  * @NL80211_NAN_SRF_INCLUDE: present if the include bit of the SRF set.
-  *	This is a flag.
-  * @NL80211_NAN_SRF_BF: Bloom Filter. Present if and only if
-- *	&NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary.
-+ *	%NL80211_NAN_SRF_MAC_ADDRS isn't present. This attribute is binary.
-  * @NL80211_NAN_SRF_BF_IDX: index of the Bloom Filter. Mandatory if
-- *	&NL80211_NAN_SRF_BF is present. This is a u8.
-+ *	%NL80211_NAN_SRF_BF is present. This is a u8.
-  * @NL80211_NAN_SRF_MAC_ADDRS: list of MAC addresses for the SRF. Present if
-- *	and only if &NL80211_NAN_SRF_BF isn't present. This is a nested
-+ *	and only if %NL80211_NAN_SRF_BF isn't present. This is a nested
-  *	attribute. Each nested attribute is a MAC address.
-  * @NUM_NL80211_NAN_SRF_ATTR: internal
-  * @NL80211_NAN_SRF_ATTR_MAX: highest NAN SRF attribute
-@@ -5469,4 +5792,15 @@ enum nl80211_nan_match_attributes {
- 	NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1
- };
- 
-+/**
-+ * nl80211_external_auth_action - Action to perform with external
-+ *     authentication request. Used by NL80211_ATTR_EXTERNAL_AUTH_ACTION.
-+ * @NL80211_EXTERNAL_AUTH_START: Start the authentication.
-+ * @NL80211_EXTERNAL_AUTH_ABORT: Abort the ongoing authentication.
-+ */
-+enum nl80211_external_auth_action {
-+	NL80211_EXTERNAL_AUTH_START,
-+	NL80211_EXTERNAL_AUTH_ABORT,
-+};
-+
- #endif /* __LINUX_NL80211_H */

package/network/utils/iw/patches/120-antenna_gain.patch

@@ -1,9 +1,9 @@
 --- a/phy.c
 +++ b/phy.c
-@@ -727,3 +727,30 @@ COMMAND(set, antenna, "<bitmap> | all |
+@@ -855,3 +855,30 @@ static int handle_get_txq(struct nl80211
- 	NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_antenna,
+ COMMAND(get, txq, "",
- 	"Set a bitmap of allowed antennas to use for TX and RX.\n"
+ 	NL80211_CMD_GET_WIPHY, 0, CIB_PHY, handle_get_txq,
- 	"The driver may reject antenna configurations it cannot support.");
+ 	"Get TXQ parameters.");
 +
 +static int handle_antenna_gain(struct nl80211_state *state,
 +			       struct nl_msg *msg,

package/network/utils/iw/patches/130-survey-bss-rx-time.patch

@@ -0,0 +1,12 @@
+--- a/survey.c
++++ b/survey.c
+@@ -60,6 +60,9 @@ static int print_survey_handler(struct n
+ 	if (sinfo[NL80211_SURVEY_INFO_CHANNEL_TIME_RX])
+ 		printf("\tchannel receive time:\t\t%llu ms\n",
+ 			(unsigned long long)nla_get_u64(sinfo[NL80211_SURVEY_INFO_CHANNEL_TIME_RX]));
++	if (sinfo[NL80211_SURVEY_INFO_TIME_BSS_RX])
++		printf("\tchannel BSS receive time:\t%llu ms\n",
++			(unsigned long long)nla_get_u64(sinfo[NL80211_SURVEY_INFO_TIME_BSS_RX]));
+ 	if (sinfo[NL80211_SURVEY_INFO_CHANNEL_TIME_TX])
+ 		printf("\tchannel transmit time:\t\t%llu ms\n",
+ 			(unsigned long long)nla_get_u64(sinfo[NL80211_SURVEY_INFO_CHANNEL_TIME_TX]));

package/network/utils/iw/patches/200-reduce_size.patch

@@ -1,6 +1,6 @@
 --- a/event.c
 +++ b/event.c
-@@ -342,6 +342,7 @@ static int print_event(struct nl_msg *ms
+@@ -699,6 +699,7 @@ static int print_event(struct nl_msg *ms
  	}
  
  	switch (gnlh->cmd) {
@@ -8,7 +8,7 @@
  	case NL80211_CMD_NEW_WIPHY:
  		printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]));
  		break;
-@@ -376,6 +377,7 @@ static int print_event(struct nl_msg *ms
+@@ -734,6 +735,7 @@ static int print_event(struct nl_msg *ms
  	case NL80211_CMD_SCHED_SCAN_RESULTS:
  		printf("got scheduled scan results\n");
  		break;
@@ -16,7 +16,7 @@
  	case NL80211_CMD_REG_CHANGE:
  		printf("regulatory domain change: ");
  
-@@ -454,6 +456,7 @@ static int print_event(struct nl_msg *ms
+@@ -812,6 +814,7 @@ static int print_event(struct nl_msg *ms
  		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
  		printf("del station %s\n", macbuf);
  		break;
@@ -24,10 +24,10 @@
  	case NL80211_CMD_JOIN_IBSS:
  		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
  		printf("IBSS %s joined\n", macbuf);
-@@ -618,9 +621,9 @@ static int print_event(struct nl_msg *ms
+@@ -989,9 +992,9 @@ static int print_event(struct nl_msg *ms
- 	case NL80211_CMD_DEL_WIPHY:
+ 		parse_nan_match(tb);
- 		printf("delete wiphy\n");
  		break;
+ 	}
 +#endif
  	default:
 -		printf("unknown event %d (%s)\n",
@@ -38,7 +38,23 @@
  
 --- a/info.c
 +++ b/info.c
-@@ -197,6 +197,7 @@ next:
+@@ -164,6 +164,7 @@ static int print_phy_handler(struct nl_m
+ 			    tb_band[NL80211_BAND_ATTR_VHT_MCS_SET])
+ 				print_vht_info(nla_get_u32(tb_band[NL80211_BAND_ATTR_VHT_CAPA]),
+ 					       nla_data(tb_band[NL80211_BAND_ATTR_VHT_MCS_SET]));
++#ifdef IW_FULL
+ 			if (tb_band[NL80211_BAND_ATTR_IFTYPE_DATA]) {
+ 				struct nlattr *nl_iftype;
+ 				int rem_band;
+@@ -171,6 +172,7 @@ static int print_phy_handler(struct nl_m
+ 				nla_for_each_nested(nl_iftype, tb_band[NL80211_BAND_ATTR_IFTYPE_DATA], rem_band)
+ 					print_he_info(nl_iftype);
+ 			}
++#endif
+ 			if (tb_band[NL80211_BAND_ATTR_FREQS]) {
+ 				if (!band_had_freq) {
+ 					printf("\t\tFrequencies:\n");
+@@ -213,6 +215,7 @@ next:
  				}
  			}
  
@@ -46,7 +62,7 @@
  			if (tb_band[NL80211_BAND_ATTR_RATES]) {
  			printf("\t\tBitrates (non-HT):\n");
  			nla_for_each_nested(nl_rate, tb_band[NL80211_BAND_ATTR_RATES], rem_rate) {
-@@ -213,6 +214,7 @@ next:
+@@ -229,6 +232,7 @@ next:
  				printf("\n");
  			}
  			}
@@ -54,7 +70,7 @@
  		}
  	}
  
-@@ -278,6 +280,7 @@ next:
+@@ -294,6 +298,7 @@ next:
  		printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
  	}
  
@@ -62,7 +78,7 @@
  	if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
  		int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
  		int i;
-@@ -289,6 +292,7 @@ next:
+@@ -305,6 +310,7 @@ next:
  					cipher_name(ciphers[i]));
  		}
  	}
@@ -70,7 +86,7 @@
  
  	if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] &&
  	    tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
-@@ -308,11 +312,13 @@ next:
+@@ -324,11 +330,13 @@ next:
  			printf("\t\t * %s\n", iftype_name(nla_type(nl_mode)));
  	}
  
@@ -84,7 +100,7 @@
  
  	if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) {
  		struct nlattr *nl_combi;
-@@ -409,6 +415,7 @@ broken_combination:
+@@ -425,6 +433,7 @@ broken_combination:
  			printf("\tinterface combinations are not supported\n");
  	}
  
@@ -92,7 +108,7 @@
  	if (tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS]) {
  		printf("\tSupported commands:\n");
  		nla_for_each_nested(nl_cmd, tb_msg[NL80211_ATTR_SUPPORTED_COMMANDS], rem_cmd)
-@@ -506,6 +513,7 @@ broken_combination:
+@@ -522,6 +531,7 @@ broken_combination:
  				printf("\t\t * wake up on TCP connection\n");
  		}
  	}
@@ -100,7 +116,7 @@
  
  	if (tb_msg[NL80211_ATTR_ROAM_SUPPORT])
  		printf("\tDevice supports roaming.\n");
-@@ -544,6 +552,7 @@ broken_combination:
+@@ -560,6 +570,7 @@ broken_combination:
  		}
  	}
  
@@ -108,15 +124,15 @@
  	if (tb_msg[NL80211_ATTR_FEATURE_FLAGS]) {
  		unsigned int features = nla_get_u32(tb_msg[NL80211_ATTR_FEATURE_FLAGS]);
  
-@@ -602,6 +611,7 @@ broken_combination:
+@@ -624,6 +635,7 @@ broken_combination:
- 		if (features & NL80211_FEATURE_TDLS_CHANNEL_SWITCH)
+ 		if (features & NL80211_FEATURE_ND_RANDOM_MAC_ADDR)
- 			printf("\tDevice supports TDLS channel switching\n");
+ 			printf("\tDevice supports randomizing MAC-addr in net-detect scans.\n");
  	}
 +#endif
  
- 	if (tb_msg[NL80211_ATTR_EXT_FEATURES]) {
+ 	if (tb_msg[NL80211_ATTR_TDLS_SUPPORT])
- 		struct nlattr *tb = tb_msg[NL80211_ATTR_EXT_FEATURES];
+ 		printf("\tDevice supports T-DLS.\n");
-@@ -658,6 +668,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP
+@@ -732,6 +744,7 @@ TOPLEVEL(list, NULL, NL80211_CMD_GET_WIP
  	 "List all wireless devices and their capabilities.");
  TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL);
  
@@ -124,7 +140,7 @@
  static int handle_commands(struct nl80211_state *state, struct nl_msg *msg,
  			   int argc, char **argv, enum id_input id)
  {
-@@ -669,6 +680,7 @@ static int handle_commands(struct nl8021
+@@ -743,6 +756,7 @@ static int handle_commands(struct nl8021
  }
  TOPLEVEL(commands, NULL, NL80211_CMD_GET_WIPHY, 0, CIB_NONE, handle_commands,
  	 "list all known commands and their decimal & hex value");
@@ -134,15 +150,17 @@
  {
 --- a/scan.c
 +++ b/scan.c
-@@ -1170,6 +1170,7 @@ static void print_ht_op(const uint8_t ty
+@@ -1195,6 +1195,9 @@ static void print_ht_op(const uint8_t ty
  	printf("\t\t * secondary channel offset: %s\n",
  		ht_secondary_offset[data[1] & 0x3]);
  	printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
++#ifndef IW_FULL
 +	return;
++#endif
  	printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3);
  	printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]);
  	printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2);
-@@ -1497,6 +1498,14 @@ static void print_ie(const struct ie_pri
+@@ -1522,6 +1525,14 @@ static void print_ie(const struct ie_pri
  
  static const struct ie_print ieprinters[] = {
  	[0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
@@ -157,7 +175,7 @@
  	[1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
  	[3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), },
  	[5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), },
-@@ -1506,21 +1515,15 @@ static const struct ie_print ieprinters[
+@@ -1531,21 +1542,15 @@ static const struct ie_print ieprinters[
  	[32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), },
  	[35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), },
  	[42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), },
@@ -180,7 +198,7 @@
  };
  
  static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data,
-@@ -1968,6 +1971,7 @@ void print_ies(unsigned char *ie, int ie
+@@ -2024,6 +2029,7 @@ void print_ies(unsigned char *ie, int ie
  		    ieprinters[ie[0]].flags & BIT(ptype)) {
  			print_ie(&ieprinters[ie[0]],
  				 ie[0], ie[1], ie + 2, &ie_buffer);
@@ -188,7 +206,7 @@
  		} else if (ie[0] == 221 /* vendor */) {
  			print_vendor(ie[1], ie + 2, unknown, ptype);
  		} else if (unknown) {
-@@ -1977,6 +1981,7 @@ void print_ies(unsigned char *ie, int ie
+@@ -2033,6 +2039,7 @@ void print_ies(unsigned char *ie, int ie
  			for (i=0; i<ie[1]; i++)
  				printf(" %.2x", ie[2+i]);
  			printf("\n");
@@ -196,7 +214,7 @@
  		}
  		ielen -= ie[1] + 2;
  		ie += ie[1] + 2;
-@@ -2017,6 +2022,7 @@ static void print_capa_non_dmg(__u16 cap
+@@ -2073,6 +2080,7 @@ static void print_capa_non_dmg(__u16 cap
  		printf(" ESS");
  	if (capa & WLAN_CAPABILITY_IBSS)
  		printf(" IBSS");
@@ -204,7 +222,7 @@
  	if (capa & WLAN_CAPABILITY_CF_POLLABLE)
  		printf(" CfPollable");
  	if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
-@@ -2045,6 +2051,7 @@ static void print_capa_non_dmg(__u16 cap
+@@ -2101,6 +2109,7 @@ static void print_capa_non_dmg(__u16 cap
  		printf(" DelayedBACK");
  	if (capa & WLAN_CAPABILITY_IMM_BACK)
  		printf(" ImmediateBACK");
@@ -212,7 +230,7 @@
  }
  
  static int print_bss_handler(struct nl_msg *msg, void *arg)
-@@ -2129,8 +2136,10 @@ static int print_bss_handler(struct nl_m
+@@ -2185,8 +2194,10 @@ static int print_bss_handler(struct nl_m
  	if (bss[NL80211_BSS_FREQUENCY]) {
  		int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
  		printf("\tfreq: %d\n", freq);
@@ -223,7 +241,7 @@
  	}
  	if (bss[NL80211_BSS_BEACON_INTERVAL])
  		printf("\tbeacon interval: %d TUs\n",
-@@ -2319,6 +2328,7 @@ static int handle_stop_sched_scan(struct
+@@ -2380,6 +2391,7 @@ static int handle_stop_sched_scan(struct
  	return 0;
  }
  
@@ -231,14 +249,14 @@
  COMMAND(scan, sched_start,
  	SCHED_SCAN_OPTIONS,
  	NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
-@@ -2329,3 +2339,4 @@ COMMAND(scan, sched_start,
+@@ -2390,3 +2402,4 @@ COMMAND(scan, sched_start,
  COMMAND(scan, sched_stop, "",
  	NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan,
  	"Stop an ongoing scheduled scan.");
 +#endif
 --- a/util.c
 +++ b/util.c
-@@ -281,6 +281,7 @@ static const char *commands[NL80211_CMD_
+@@ -153,6 +153,7 @@ static const char *commands[NL80211_CMD_
  
  static char cmdbuf[100];
  
@@ -246,7 +264,7 @@
  const char *command_name(enum nl80211_commands cmd)
  {
  	if (cmd <= NL80211_CMD_MAX && commands[cmd])
-@@ -288,6 +289,7 @@ const char *command_name(enum nl80211_co
+@@ -160,6 +161,7 @@ const char *command_name(enum nl80211_co
  	sprintf(cmdbuf, "Unknown command (%d)", cmd);
  	return cmdbuf;
  }
@@ -254,23 +272,23 @@
  
  int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
  {
-@@ -426,6 +428,9 @@ int parse_keys(struct nl_msg *msg, char
+@@ -298,6 +300,9 @@ int parse_keys(struct nl_msg *msg, char
  	char keybuf[13];
  	int pos = 0;
  
 +#ifndef IW_FULL
 +	return 1;
 +#endif
- 	if (!argc)
+ 	if (!*argc)
  		return 1;
  
 --- a/Makefile
 +++ b/Makefile
-@@ -25,6 +25,12 @@ OBJS-$(HWSIM) += hwsim.o
+@@ -22,6 +22,12 @@ _OBJS := $(sort $(patsubst %.c,%.o,$(wil
+ VERSION_OBJS := $(filter-out version.o, $(_OBJS))
+ OBJS := $(VERSION_OBJS) version.o
  
- OBJS += $(OBJS-y) $(OBJS-Y)
++OBJS_FULL = ocb offch cqm wowlan coalesce roc p2p vendor mgmt ap sha256 nan bloom measurements ftm
- 
-+OBJS_FULL = ocb offch cqm wowlan coalesce roc p2p ap mgmt vendor
 +ifdef IW_FULL
 +  CFLAGS += -DIW_FULL
 +else
@@ -281,7 +299,7 @@
  ifeq ($(NO_PKG_CONFIG),)
 --- a/station.c
 +++ b/station.c
-@@ -629,10 +629,12 @@ static int handle_station_set_plink(stru
+@@ -759,10 +759,12 @@ static int handle_station_set_plink(stru
   nla_put_failure:
  	return -ENOBUFS;
  }
@@ -294,7 +312,7 @@
  
  static int handle_station_set_vlan(struct nl80211_state *state,
  				   struct nl_msg *msg,
-@@ -727,11 +729,13 @@ static int handle_station_set_mesh_power
+@@ -857,11 +859,13 @@ static int handle_station_set_mesh_power
  nla_put_failure:
  	return -ENOBUFS;
  }
@@ -306,11 +324,11 @@
  	select_station_cmd, station_set_mesh_power_mode);
 +#endif
  
- static int handle_station_dump(struct nl80211_state *state,
+ static int handle_station_set_airtime_weight(struct nl80211_state *state,
- 			       struct nl_msg *msg,
+ 					     struct nl_msg *msg,
 --- a/interface.c
 +++ b/interface.c
-@@ -615,9 +615,11 @@ static int handle_interface_wds_peer(str
+@@ -627,9 +627,11 @@ static int handle_interface_wds_peer(str
   nla_put_failure:
  	return -ENOBUFS;
  }
@@ -322,7 +340,7 @@
  
  static int set_mcast_rate(struct nl80211_state *state,
  			  struct nl_msg *msg,
-@@ -707,6 +709,7 @@ static int handle_chan(struct nl80211_st
+@@ -719,6 +721,7 @@ static int handle_chan(struct nl80211_st
  	return handle_chanfreq(state, msg, true, argc, argv, id);
  }
  
@@ -330,22 +348,22 @@
  SECTION(switch);
  COMMAND(switch, freq,
  	"<freq> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons <count>] [block-tx]\n"
-@@ -715,3 +718,4 @@ COMMAND(switch, freq,
+@@ -727,3 +730,4 @@ COMMAND(switch, freq,
  	"Switch the operating channel by sending a channel switch announcement (CSA).");
  COMMAND(switch, channel, "<channel> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [beacons <count>] [block-tx]",
  	NL80211_CMD_CHANNEL_SWITCH, 0, CIB_NETDEV, handle_chan, NULL);
 +#endif
 --- a/phy.c
 +++ b/phy.c
-@@ -359,6 +359,7 @@ static int handle_cac(struct nl80211_sta
+@@ -369,6 +369,7 @@ err_out:
- 
+ 		free(cac_trigger_argv);
- 	return 0;
+ 	return err;
  }
 +#ifdef IW_FULL
  TOPLEVEL(cac, "channel <channel> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz]\n"
  	      "freq <freq> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz]\n"
  	      "freq <control freq> [5|10|20|40|80|80+80|160] [<center1_freq> [<center2_freq>]]",
-@@ -370,6 +371,7 @@ COMMAND(cac, trigger,
+@@ -380,6 +381,7 @@ COMMAND(cac, trigger,
  	NL80211_CMD_RADAR_DETECT, 0, CIB_NETDEV, handle_cac_trigger,
  	"Start or trigger a channel availability check (CAC) looking to look for\n"
  	"radars on the given channel.");