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 <mail@david-bauer.net>
This commit is contained in:
David Bauer 2020-10-18 22:35:31 +02:00
parent 43fe0bd18d
commit e66bd0eb04

View File

@ -625,17 +625,16 @@ hostapd_set_bss_options() {
append bss_conf "bss_transition=$bss_transition" "$N" append bss_conf "bss_transition=$bss_transition" "$N"
fi fi
json_get_vars ieee80211k json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
set_default ieee80211k 0 set_default ieee80211k 0
if [ "$ieee80211k" -eq "1" ]; then if [ "$ieee80211k" -eq "1" ]; then
json_get_vars rrm_neighbor_report rrm_beacon_report
set_default rrm_neighbor_report 1 set_default rrm_neighbor_report 1
set_default rrm_beacon_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 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 if [ "$wpa" -ge "1" ]; then
json_get_vars ieee80211r json_get_vars ieee80211r
set_default ieee80211r 0 set_default ieee80211r 0