ubsec: Fix bus disable ordering and fix probe error path.

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

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 1ce62fd..4c57d11 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -67,6 +67,7 @@ hostapd_setup_vif() {
                ;;
                *)
                        wpa=0
+                       crypto=
                ;;
        esac
        config_get ifname "$vif" ifname
@@ -75,6 +76,7 @@ hostapd_setup_vif() {
        config_get device "$vif" device
        config_get channel "$device" channel
        config_get hwmode "$device" hwmode
+       config_get country "$device" country
        case "$hwmode" in
                11a) hwmode=a;;
                11b) hwmode=b;;
@@ -94,7 +96,8 @@ ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 wpa=$wpa
-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
+${country:+country_code=$country}
 $hostapd_cfg
 EOF
        hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf