[ext4] add missing dependencies

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

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 7a67cec..a078838 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -22,7 +22,7 @@ hostapd_setup_vif() {
                        wpa=3
                        crypto="CCMP TKIP"
                ;;
                        wpa=3
                        crypto="CCMP TKIP"
                ;;

-               *) 
+               *)

                        wpa=1
                        crypto="TKIP"
                ;;
                        wpa=1
                        crypto="TKIP"
                ;;


@@ -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,25 +75,36 @@ 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;;
-               *) agmode=;;
+       config_get hwmode "$device" hwmode
+       case "$hwmode" in
+               bg) hwmode=g;;

        esac
        esac

+       config_get country "$device" country
+       [ "$channel" = auto ] && channel=
+       [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
+       [ -n "$hwmode" ] && {
+               config_get hwmode_11n "$device" hwmode_11n
+               [ -n "$hwmode_11n" ] && {
+                       hwmode="$hwmode_11n"
+                       config_get ht_capab "$device" ht_capab
+               }
+       }

        cat > /var/run/hostapd-$ifname.conf <<EOF
        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}
-channel=$channel
+${hwmode:+hw_mode=$hwmode}
+${channel:+channel=$channel}

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

-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
+${country:+country_code=$country}
+${hwmode_11n:+ieee80211n=1}
+${ht_capab:+ht_capab=$ht_capab}

 $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

 }
 
 }