hostapd: remove ieee80211v option

Remove the ieee80211v option. It previously was required to be enabled
in order to use time_advertisement, time_zone, wnm_sleep_mode and
bss_transition, however it didn't enable any of these options by default.

Remove it, as configuring these options independently is enough.

This change does not influence the behavior of any already configured
setting.

Signed-off-by: David Bauer <mail@david-bauer.net>

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 832a05633922c2924b377b1366ad3dc8e9085941..8e05ae211f0ecbbd44de958a88978543ecc7d4e6 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -239,7 +239,7 @@ hostapd_common_add_bss_config() {
        config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
        config_add_string multi_ap_backhaul_ssid multi_ap_backhaul_key
 
        config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
        config_add_string multi_ap_backhaul_ssid multi_ap_backhaul_key
 

-       config_add_boolean ieee80211v wnm_sleep_mode bss_transition
+       config_add_boolean wnm_sleep_mode bss_transition

        config_add_int time_advertisement
        config_add_string time_zone
 
        config_add_int time_advertisement
        config_add_string time_zone
 


@@ -610,20 +610,12 @@ hostapd_set_bss_options() {
                append bss_conf "iapp_interface=$ifname" "$N"
        }
 
                append bss_conf "iapp_interface=$ifname" "$N"
        }
 

-       json_get_vars ieee80211v
-       set_default ieee80211v 0
-       if [ "$ieee80211v" -eq "1" ]; then
-               json_get_vars time_advertisement time_zone wnm_sleep_mode bss_transition
+       json_get_vars time_advertisement time_zone wnm_sleep_mode bss_transition

 
 

-               set_default time_advertisement 0
-               set_default wnm_sleep_mode 0
-               set_default bss_transition 0
-
-               append bss_conf "time_advertisement=$time_advertisement" "$N"
-               [ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
-               append bss_conf "wnm_sleep_mode=$wnm_sleep_mode" "$N"
-               append bss_conf "bss_transition=$bss_transition" "$N"
-       fi
+       [ -n "$time_advertisement" ] && append bss_conf "time_advertisement=$time_advertisement" "$N"
+       [ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
+       [ "$wnm_sleep_mode" -eq "1" ] && append bss_conf "wnm_sleep_mode=1" "$N"
+       [ "$bss_transition" -eq "1" ] && append bss_conf "bss_transition=1" "$N"

 
        json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
        set_default ieee80211k 0
 
        json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
        set_default ieee80211k 0