diff --git a/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch b/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch
index 3184e83..82dbbd5 100644
--- a/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch
+++ b/autobuild_mac80211_release/0001-wifi7-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 c9e2a37..3cac683 100644
+index c9e2a37f..3cac683d 100644
 --- a/package/kernel/mac80211/Makefile
 +++ b/package/kernel/mac80211/Makefile
 @@ -20,6 +20,7 @@ PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
@@ -30,7 +30,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 8606093..220621c 100644
+index 86060930..220621cb 100644
 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 @@ -25,10 +25,12 @@ drv_mac80211_init_device_config() {
@@ -537,7 +537,7 @@
  
  	json_set_namespace wdev_uc prev
 diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-index e24a2a6..da3ee8c 100644
+index e24a2a63..88dfaa36 100644
 --- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
 +++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
 @@ -60,6 +60,9 @@ BEGIN {
@@ -577,7 +577,7 @@
  $1 == "*" && $3 == "MHz" && $0 !~ /disabled/ && band && !channel {
          channel = $4
  }
-@@ -120,6 +136,25 @@ get_band_defaults() {
+@@ -120,6 +136,26 @@ get_band_defaults() {
  		mode_band="$band"
  		channel="$chan"
  		htmode="$mode"
@@ -589,6 +589,7 @@
 +			ieee80211w=2
 +			channel=37
 +			mbssid=1
++			mbo=1
 +		elif [ "$band" = "5g" ]
 +		then
 +			noscan=1
@@ -603,7 +604,7 @@
  	done
  }
  
-@@ -153,6 +188,10 @@ detect_mac80211() {
+@@ -153,6 +189,10 @@ detect_mac80211() {
  
  	json_load_file /etc/board.json
  
@@ -614,7 +615,7 @@
  	for _dev in /sys/class/ieee80211/*; do
  		[ -e "$_dev" ] || continue
  
-@@ -162,6 +201,14 @@ detect_mac80211() {
+@@ -162,6 +202,14 @@ detect_mac80211() {
  		channel=""
  		htmode=""
  		ht_capab=""
@@ -629,7 +630,7 @@
  
  		get_band_defaults "$dev"
  
-@@ -196,6 +243,14 @@ detect_mac80211() {
+@@ -196,6 +244,14 @@ detect_mac80211() {
  				;;
  		esac
  
@@ -644,7 +645,7 @@
  		uci -q batch <<-EOF
  			set wireless.${name}=wifi-device
  			set wireless.${name}.type=mac80211
-@@ -203,15 +258,43 @@ detect_mac80211() {
+@@ -203,15 +259,46 @@ detect_mac80211() {
  			set wireless.${name}.channel=${channel}
  			set wireless.${name}.band=${mode_band}
  			set wireless.${name}.htmode=$htmode
@@ -688,11 +689,14 @@
 +		[ -n "$ieee80211w" ] && {
 +			uci -q set wireless.default_${name}.ieee80211w=${ieee80211w}
 +		}
++		[ -n "$mbo" ] && {
++			uci -q set wireless.default_${name}.mbo=${mbo}
++		}
  		uci -q commit wireless
  	done
  }
 diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
-index 271c1f7..c668e82 100644
+index 271c1f7b..c668e822 100644
 --- a/package/network/services/hostapd/files/hostapd.sh
 +++ b/package/network/services/hostapd/files/hostapd.sh
 @@ -60,7 +60,14 @@ hostapd_append_wpa_key_mgmt() {