hostapd: Always enable 802.11d

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.hostapd b/src/functions/functions.hostapd
index c6608e2459037ca688a3d91ebfe63b0de42fc167..a3c34920aeb5ce3fb43615d9c55ebebe0d74f773 100644 (file)
--- a/src/functions/functions.hostapd
+++ b/src/functions/functions.hostapd
@@ -35,7 +35,6 @@ hostapd_config_write() {
        local channel
        local country_code="$(wireless_get_reg_domain)"
        local encryption
-       local ieee80211d="1"
        local key
        local mode
        local ssid
@@ -52,14 +51,6 @@ hostapd_config_write() {
                        --encryption=*)
                                encryption=$(cli_get_val "${1}")
                                ;;
-                       --ieee80211d=*)
-                               local val="$(cli_get_val "${1}")"
-                               if enabled val; then
-                                       ieee80211d="1"
-                               else
-                                       ieee80211d="0"
-                               fi
-                               ;;
                        --key=*)
                                key=$(cli_get_val "${1}")
                                ;;
@@ -140,11 +131,15 @@ hostapd_config_write() {
        fi
 
        (
+               print "# Default settings"
+
+               # Advertise country code and maximum transmission power
+               print "ieee80211d=1"
+
                print "# Wireless configuration"
                print "channel=${channel}"
                print "country_code=${country_code}"
                print "hw_mode=${hw_mode}"
-               print "ieee80211d=${ieee80211d}"
                print "ieee80211n=${ieee80211n}"
                print "ignore_broadcast_ssid=${ignore_broadcast_ssid}"