[][MAC80211][misc][Remvoe start_disabled from netifd mac80211 script]
[Description]
Remove adding start_disabled flag to hostapd config when sta number > 0 from netifd mac80211 script.
When start_disabled is on, AP will postpone setting the beacon interval until STA is associated, which leads to the pre-CAC expired state for AP (AP has no beacon) after CAC is completed.
[Release-log]
N/A
Change-Id: Ia15cc2ec038918ca14541f9d777aaf7d523bfe64
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7179435
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 ec6480b..0c2070c 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 58f07e1..e9a0dd3 100644
+index b7059fe6..62c13eb2 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 0a7f787..4bae0bc 100644
+index 5aaba9af..ac23b3ae 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -144,9 +144,6 @@ mac80211_hostapd_setup_base() {
@@ -61,6 +61,15 @@
hostapd_prepare_device_config "$hostapd_conf_file" nl80211
cat >> "$hostapd_conf_file" <<EOF
${channel:+channel=$channel}
+@@ -517,7 +515,7 @@ mac80211_hostapd_setup_bss() {
+ append hostapd_cfg "wds_sta=1" "$N"
+ [ -n "$wds_bridge" ] && append hostapd_cfg "wds_bridge=$wds_bridge" "$N"
+ }
+- [ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
++ [ "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
+
+ cat >> /var/run/hostapd-$phy.conf <<EOF
+ $hostapd_cfg
@@ -1058,6 +1056,9 @@ mac80211_setup_vif() {
json_select ..
@@ -72,7 +81,7 @@
get_freq() {
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-index 3ecd932..438bf92 100644
+index e24a2a63..10a3f8b4 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -120,6 +120,13 @@ get_band_defaults() {
@@ -98,7 +107,7 @@
get_band_defaults "$dev"
-@@ -206,8 +215,12 @@ detect_mac80211() {
+@@ -210,8 +219,12 @@ detect_mac80211() {
set wireless.default_${name}.network=lan
set wireless.default_${name}.mode=ap
set wireless.default_${name}.ssid=OpenWrt
@@ -113,7 +122,7 @@
done
}
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
-index 8c233a4..f2d4ad3 100644
+index 8c233a4e..f2d4ad3d 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -1573,6 +1573,11 @@ wpa_supplicant_add_network() {
@@ -128,6 +137,3 @@
if [ "$key_mgmt" = "WPS" ]; then
echo "wps_cred_processing=1" >> "$_config"
else
---
-2.36.1
-