hostapd: make rrm report independent of ieee80211k setting

[openwrt/openwrt.git] / package / network / services / hostapd / files / hostapd.sh

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index b33e8e1edc047812c38899b8aa0fb4bc512d01e0..832a05633922c2924b377b1366ad3dc8e9085941 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -625,17 +625,16 @@ hostapd_set_bss_options() {
                append bss_conf "bss_transition=$bss_transition" "$N"
        fi
 
-       json_get_vars ieee80211k
+       json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
        set_default ieee80211k 0
        if [ "$ieee80211k" -eq "1" ]; then
-               json_get_vars rrm_neighbor_report rrm_beacon_report
-
                set_default rrm_neighbor_report 1
                set_default rrm_beacon_report 1
-               append bss_conf "rrm_neighbor_report=$rrm_neighbor_report" "$N"
-               append bss_conf "rrm_beacon_report=$rrm_beacon_report" "$N"
        fi
 
+       [ "$rrm_neighbor_report" -eq "1" ] && append bss_conf "rrm_neighbor_report=1" "$N"
+       [ "$rrm_beacon_report" -eq "1" ] && append bss_conf "rrm_beacon_report=1" "$N"
+
        if [ "$wpa" -ge "1" ]; then
                json_get_vars ieee80211r
                set_default ieee80211r 0
@@ -896,6 +895,7 @@ wpa_supplicant_prepare_interface() {
        fi
        wpa_supplicant_teardown_interface "$ifname"
        cat > "$_config" <<EOF
+${scan_list:+freq_list=$scan_list}
 $ap_scan
 $country_str
 EOF