[][MAC80211][WiFi7][misc][remove sleep for each phy when teardown]
[Description]
Remove sleep for each phy when teardown.
It was used to change the teardown order into phy2->phy1->phy0, and
also prevent conflict between each phy.
Now hostapd has its solution to avoid the problem, so the sleep becomes
unnecessary.
[Release-log]
N/A
Change-Id: I7b1dc614a5bb67cd3f7283ac9f1887c57d654afe
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9051264
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0001-wifi-scripts-add-mlo-config.patch b/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0001-wifi-scripts-add-mlo-config.patch
index d8ae424..514e274 100644
--- a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0001-wifi-scripts-add-mlo-config.patch
+++ b/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0001-wifi-scripts-add-mlo-config.patch
@@ -1,5 +1,5 @@
diff --git a/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh b/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh
-index 3537e3a..3664297 100644
+index 3537e3ae..3664297a 100644
--- a/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh
+++ b/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh
@@ -412,6 +412,10 @@ hostapd_common_add_bss_config() {
@@ -138,7 +138,7 @@
return 0
}
diff --git a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
-index 66bdf5c..35d317f 100755
+index 66bdf5cf..aeaafa05 100755
--- a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
+++ b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
@@ -29,7 +29,7 @@ drv_mac80211_init_device_config() {
@@ -391,30 +391,8 @@
}
_list_phy_interfaces() {
-@@ -1401,8 +1476,21 @@ drv_mac80211_teardown() {
- return 1
- }
-
-+ # each phy sleeps different times to prevent for ubus race condition.
-+ if [ "$phy" = "phy1" ]; then
-+ sleep 3;
-+ elif [ "$phy" = "phy0" ]; then
-+ sleep 6;
-+ fi
-+
- mac80211_reset_config "$phy"
-
-+ if [ "$phy" = "phy1" ]; then
-+ sleep 3;
-+ elif [ "$phy" = "phy2" ]; then
-+ sleep 6;
-+ fi
-+
- for wdev in $(list_phy_interfaces "$phy"); do
- ip link set dev "$wdev" down
- iw dev "$wdev" del
diff --git a/package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh b/package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh
-index 3c78e1a..d8a1756 100644
+index 3c78e1a1..d8a17563 100644
--- a/package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh
+++ b/package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh
@@ -133,6 +133,11 @@ get_band_defaults() {
@@ -478,4 +456,3 @@
uci -q batch <<-EOF
set wireless.default_${name}=wifi-iface
-