From: Jan Hoffmann Date: Fri, 3 Jul 2020 11:53:47 +0000 (+0200) Subject: mac80211: allow ACS restriction with fixed channel X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dfe0bc860f67a53a9c9de6d7810c0bffa3bbdd6c;p=openwrt%2Fstaging%2Fblocktrron.git 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 [reorder structure] Signed-off-by: David Bauer --- 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