[toolchain] gdb: use @GNU mirror facility, cleanup

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

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 1159c3b..4c57d11 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -67,6 +67,7 @@ hostapd_setup_vif() {
                ;;
                *)
                        wpa=0
                ;;
                *)
                        wpa=0

+                       crypto=

                ;;
        esac
        config_get ifname "$vif" ifname
                ;;
        esac
        config_get ifname "$vif" ifname


@@ -74,28 +75,31 @@ hostapd_setup_vif() {
        config_get ssid "$vif" ssid
        config_get device "$vif" device
        config_get channel "$device" channel
        config_get ssid "$vif" ssid
        config_get device "$vif" device
        config_get channel "$device" channel

-       config_get agmode "$device" agmode
-       case "$agmode" in
-               11a) agmode=a;;
-               11b) agmode=b;;
-               11g) agmode=g;;
+       config_get hwmode "$device" hwmode
+       config_get country "$device" country
+       case "$hwmode" in
+               11a) hwmode=a;;
+               11b) hwmode=b;;
+               11g) hwmode=g;;

                *)
                *)

-                       agmode=
-                       [ "$channel" -gt 14 ] && agmode=a
+                       hwmode=
+                       [ "$channel" -gt 14 ] && hwmode=a

                ;;
        esac
        cat > /var/run/hostapd-$ifname.conf <<EOF
                ;;
        esac
        cat > /var/run/hostapd-$ifname.conf <<EOF

+ctrl_interface=/var/run/hostapd-$ifname

 driver=$driver
 interface=$ifname
 driver=$driver
 interface=$ifname

-hw_mode=${agmode:-g}
+hw_mode=${hwmode:-g}

 channel=$channel
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 wpa=$wpa
 channel=$channel
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 wpa=$wpa

-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
+${country:+country_code=$country}

 $hostapd_cfg
 EOF
 $hostapd_cfg
 EOF

-       hostapd -B /var/run/hostapd-$ifname.conf
+       hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf

 }
 
 }