[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 a2f2d6f..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=1
                        crypto="TKIP"
                ;;
@@ -77,25 +77,32 @@ hostapd_setup_vif() {
        config_get channel "$device" channel
        config_get hwmode "$device" hwmode
        case "$hwmode" in
-               11a) hwmode=a;;
-               11b) hwmode=b;;
-               11g) hwmode=g;;
-               *)
-                       hwmode=
-                       [ "$channel" -gt 14 ] && hwmode=a
-               ;;
+               bg) hwmode=g;;
        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
 ctrl_interface=/var/run/hostapd-$ifname
 driver=$driver
 interface=$ifname
-hw_mode=${hwmode:-g}
-channel=$channel
+${hwmode:+hw_mode=$hwmode}
+${channel:+channel=$channel}
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 wpa=$wpa
 ${crypto:+wpa_pairwise=$crypto}
+${country:+country_code=$country}
+${hwmode_11n:+ieee80211n=1}
+${ht_capab:+ht_capab=$ht_capab}
 $hostapd_cfg
 EOF
        hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf