madwifi: fix noise level display and make the cca threshold configurable through...

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

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 270b909..7401557 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -46,8 +46,8 @@ hostapd_setup_vif() {
                        fi
                ;;
                *wpa*|*WPA*)
-                       # required fields? formats?
-                       # hostapd is particular, maybe a default configuration for failures
+                       # required fields? formats?
+                       # hostapd is particular, maybe a default configuration for failures
                        config_get server "$vif" server
                        append hostapd_cfg "auth_server_addr=$server" "$N"
                        config_get port "$vif" port
@@ -76,6 +76,11 @@ hostapd_setup_vif() {
        config_get device "$vif" device
        config_get channel "$device" channel
        config_get hwmode "$device" hwmode
+       config_get wpa_group_rekey "$vif" wpa_group_rekey
+       config_get ieee80211d "$vif" ieee80211d
+       config_get_bool hidden "$vif" hidden 0
+       config_get_bool wds "$vif" wds 0
+       [ "$wds" -gt 0 -a "$driver" = "nl80211" ] && wds="wds_sta=1" || wds=""
        case "$hwmode" in
                bg) hwmode=g;;
        esac
@@ -87,6 +92,9 @@ hostapd_setup_vif() {
                [ -n "$hwmode_11n" ] && {
                        hwmode="$hwmode_11n"
                        config_get ht_capab "$device" ht_capab
+                       [ -n "$ht_capab" -a -n "${ht_capab%%\[*}" ] && {
+                               ht_capab=`echo "[$ht_capab]" | sed -e 's, ,][,g'`
+                       }
                }
        }
        cat > /var/run/hostapd-$ifname.conf <<EOF
@@ -102,8 +110,57 @@ ${crypto:+wpa_pairwise=$crypto}
 ${country:+country_code=$country}
 ${hwmode_11n:+ieee80211n=1}
 ${ht_capab:+ht_capab=$ht_capab}
+${wpa_group_rekey:+wpa_group_rekey=$wpa_group_rekey}
+${ieee80211d:+ieee80211d=$ieee80211d}
+$wds
 $hostapd_cfg
 EOF
+       case "$driver" in
+               madwifi)
+               ;;
+               *) 
+                       cat >> /var/run/hostapd-$ifname.conf <<EOF
+ignore_broadcast_ssid=$hidden
+wmm_enabled=1
+wmm_ac_bk_cwmin=4
+wmm_ac_bk_cwmax=10
+wmm_ac_bk_aifs=7
+wmm_ac_bk_txop_limit=0
+wmm_ac_bk_acm=0
+wmm_ac_be_aifs=3
+wmm_ac_be_cwmin=4
+wmm_ac_be_cwmax=10
+wmm_ac_be_txop_limit=0
+wmm_ac_be_acm=0
+wmm_ac_vi_aifs=2
+wmm_ac_vi_cwmin=3
+wmm_ac_vi_cwmax=4
+wmm_ac_vi_txop_limit=94
+wmm_ac_vi_acm=0
+wmm_ac_vo_aifs=2
+wmm_ac_vo_cwmin=2
+wmm_ac_vo_cwmax=3
+wmm_ac_vo_txop_limit=47
+wmm_ac_vo_acm=0
+tx_queue_data3_aifs=7
+tx_queue_data3_cwmin=15
+tx_queue_data3_cwmax=1023
+tx_queue_data3_burst=0
+tx_queue_data2_aifs=3
+tx_queue_data2_cwmin=15
+tx_queue_data2_cwmax=63
+tx_queue_data2_burst=0
+tx_queue_data1_aifs=1
+tx_queue_data1_cwmin=7
+tx_queue_data1_cwmax=15
+tx_queue_data1_burst=3.0
+tx_queue_data0_aifs=1
+tx_queue_data0_cwmin=3
+tx_queue_data0_cwmax=7
+tx_queue_data0_burst=1.5
+EOF
+               ;;
+       esac
        hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
 }