diff --git a/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch b/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
index 311ecbf..9f14a68 100644
--- a/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
+++ b/autobuild_mac80211_release/0001-master-mac80211-generate-hostapd-setting-from-ap-cap.patch
@@ -1,5 +1,5 @@
 diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index 02cf715d8e..d878cb2a46 100644
+index 225649d..8a51567 100644
 --- a/package/kernel/mac80211/Makefile
 +++ b/package/kernel/mac80211/Makefile
 @@ -20,6 +20,7 @@ PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
@@ -31,7 +31,7 @@
  		$(PKG_BUILD_DIR)/include/linux/ssb \
  		$(PKG_BUILD_DIR)/include/linux/bcma \
 diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-index 5aaba9af26..2ea3e7c955 100644
+index 5aaba9a..2ea3e7c 100644
 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 @@ -27,6 +27,7 @@ drv_mac80211_init_device_config() {
@@ -430,19 +430,20 @@
  			ret="$?"
  			[ "$ret" != 0 -o -z "$hostapd_res" ] && {
 diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-index e24a2a634e..7c836106d9 100644
+index e24a2a6..bf518ff 100644
 --- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
 +++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-@@ -60,6 +60,8 @@ BEGIN {
+@@ -60,6 +60,9 @@ BEGIN {
  		if (vht && band != "1:") mode="VHT80"
  		if (he) mode="HE80"
  		if (he && band == "1:") mode="HE20"
-+		if (eht) mode="EHT80"
++		if (eht && band == "2:") mode="EHT160"
++		if (eht && band == "4:") mode="EHT320"
 +		if (eht && band == "1:") mode="EHT20"
                  sub("\\[", "", channel)
                  sub("\\]", "", channel)
                  bands = bands band channel ":" mode " "
-@@ -73,6 +75,7 @@ $1 == "Band" {
+@@ -73,6 +76,7 @@ $1 == "Band" {
  	vht = ""
  	ht = ""
  	he = ""
@@ -450,7 +451,7 @@
  }
  
  $0 ~ "Capabilities:" {
-@@ -87,6 +90,10 @@ $0 ~ "HE Iftypes" {
+@@ -87,6 +91,18 @@ $0 ~ "HE Iftypes" {
  	he=1
  }
  
@@ -458,10 +459,18 @@
 +	eht=1
 +}
 +
++$0 ~ / *HE MAC Capabilities \(0x000000000000\)/ {
++	he=0
++}
++
++$0 ~ / *EHT MAC Capabilities \(0x0000\)/ {
++	eht=0
++}
++
  $1 == "*" && $3 == "MHz" && $0 !~ /disabled/ && band && !channel {
          channel = $4
  }
-@@ -120,6 +127,14 @@ get_band_defaults() {
+@@ -120,6 +136,15 @@ get_band_defaults() {
  		mode_band="$band"
  		channel="$chan"
  		htmode="$mode"
@@ -469,14 +478,15 @@
 +		then
 +			encryption=sae
 +			key=12345678
-+			sae_pwe=1
++			sae_pwe=2
++			ieee80211w=2
 +		else
 +			encryption=none
 +		fi
  	done
  }
  
-@@ -153,6 +168,10 @@ detect_mac80211() {
+@@ -153,6 +178,10 @@ detect_mac80211() {
  
  	json_load_file /etc/board.json
  
@@ -487,17 +497,18 @@
  	for _dev in /sys/class/ieee80211/*; do
  		[ -e "$_dev" ] || continue
  
-@@ -162,6 +181,9 @@ detect_mac80211() {
+@@ -162,6 +191,10 @@ detect_mac80211() {
  		channel=""
  		htmode=""
  		ht_capab=""
 +		encryption=""
 +		key=""
 +		sae_pwe=""
++		ieee80211w=""
  
  		get_band_defaults "$dev"
  
-@@ -196,6 +218,11 @@ detect_mac80211() {
+@@ -196,6 +229,11 @@ detect_mac80211() {
  				;;
  		esac
  
@@ -509,11 +520,12 @@
  		uci -q batch <<-EOF
  			set wireless.${name}=wifi-device
  			set wireless.${name}.type=mac80211
-@@ -203,15 +230,24 @@ detect_mac80211() {
+@@ -203,15 +241,28 @@ detect_mac80211() {
  			set wireless.${name}.channel=${channel}
  			set wireless.${name}.band=${mode_band}
  			set wireless.${name}.htmode=$htmode
 -			set wireless.${name}.disabled=1
++			set wireless.${name}.country='US'
 +			set wireless.${name}.disabled=0
  
  			set wireless.default_${name}=wifi-iface
@@ -534,11 +546,14 @@
 +		[ -n "$sae_pwe" ] && {
 +			uci -q set wireless.default_${name}.sae_pwe=${sae_pwe}
 +		}
++		[ -n "$ieee80211w" ] && {
++			uci -q set wireless.default_${name}.ieee80211w=${ieee80211w}
++		}
  		uci -q commit wireless
  	done
  }
 diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
-index 28bd210623..5e21d0d680 100644
+index 28bd210..5e21d0d 100644
 --- a/package/network/services/hostapd/files/hostapd.sh
 +++ b/package/network/services/hostapd/files/hostapd.sh
 @@ -376,6 +376,13 @@ hostapd_common_add_bss_config() {
@@ -606,3 +621,6 @@
  	if [ "$key_mgmt" = "WPS" ]; then
  		echo "wps_cred_processing=1" >> "$_config"
  	else
+-- 
+2.18.0
+