[openwrt/openwrt] mac80211: allow ACS restriction with fixed channel

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/dfe0bc860f67a53a9c9de6d7810c0bffa3bbdd6c

commit dfe0bc860f67a53a9c9de6d7810c0bffa3bbdd6c
Author: Jan Hoffmann <jan at 3e8.eu>
AuthorDate: Fri Jul 3 13:53:47 2020 +0200

    mac80211: allow ACS restriction with fixed channel
    
    This can be useful when a DFS channel is configured, as the ACS channel
    list is taken into account when switching channels after a radar event.
    For example, this allows to prevent the SRD channels from being used in
    that case.
    
    Signed-off-by: Jan Hoffmann <jan at 3e8.eu>
    [reorder structure]
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index de003e3d23..a131992f26 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -101,7 +101,6 @@ mac80211_hostapd_setup_base() {
 	json_select config
 
 	[ "$auto_channel" -gt 0 ] && channel=acs_survey
-	[ "$auto_channel" -gt 0 ] && json_get_values channel_list channels
 
 	[ "$auto_channel" -gt 0 ] && json_get_vars acs_exclude_dfs
 	[ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
@@ -109,6 +108,7 @@ mac80211_hostapd_setup_base() {
 
 	json_get_vars noscan ht_coex
 	json_get_values ht_capab_list ht_capab tx_burst
+	json_get_values channel_list channels
 
 	set_default noscan 0