From: David Bauer Date: Sun, 18 Oct 2020 20:35:31 +0000 (+0200) Subject: hostapd: make rrm report independent of ieee80211k setting X-Git-Tag: v21.02.0-rc1~1262 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=e66bd0eb0469d6b53da72acf28043d9a552470fe;ds=sidebyside hostapd: make rrm report independent of ieee80211k setting Allow to configure both RRM beacon as well as neighbor reports independently and only enable them by default in case the ieee80211k config option is set. Signed-off-by: David Bauer --- diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 3290358ed2..832a056339 100644 --- 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