clean up default wifi config

[openwrt/svn-archive/archive.git] / package / madwifi / files / lib / wifi / madwifi.sh

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 51dedfa77ece42e981836d2c6cc14182bbc1d1fa..46f994ea74c953306f7d8c129bf851ee8a188afe 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -35,6 +35,7 @@ scan_atheros() {
        case "${adhoc:+1}:${sta:+1}:${ap+1}" in
                # valid mode combinations
                1::) wds="";;
+               1::1);;
                :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
                :1:);;
                ::1);;
@@ -103,14 +104,18 @@ enable_atheros() {
                        esac
                        iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null 
                        ifconfig "$ifname" up
+                       sleep 1
                        iwpriv "$ifname" mode "$agmode"
                        iwpriv "$ifname" pureg "$pureg"
                        iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
                }
        
-               config_get_bool hidden "$vif" hidden
+               config_get_bool hidden "$vif" hidden 0
                iwpriv "$ifname" hide_ssid "$hidden"
 
+               config_get_bool ff "$vif" ff 0
+               iwpriv "$ifname" ff "$ff"
+
                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;
@@ -179,6 +184,16 @@ enable_atheros() {
                        iwconfig "$ifname" txpower "${txpwr%%.*}"
                fi
 
+               config_get frag "$vif" frag
+               if [ -n "$frag" ]; then
+                       iwconfig "$ifname" frag "${frag%%.*}"
+               fi
+
+               config_get rts "$vif" rts
+               if [ -n "$rts" ]; then
+                       iwconfig "$ifname" rts "${rts%%.*}"
+               fi
+
                ifconfig "$ifname" up
                iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
 
@@ -247,24 +262,16 @@ detect_atheros() {
 config wifi-device  $dev
        option type     atheros
        option channel  5
-#       option diversity 1
-#       option txantenna 0
-#       option rxantenna 0
-#       option distance  2000
-# disable radio to prevent an open ap after reflashing:
-       option disabled 1
 
+       # REMOVE THIS LINE TO ENABLE WIFI:
+       option disabled 1
 
 config wifi-iface
        option device   $dev
        option network  lan
        option mode     ap
        option ssid     OpenWrt
-       option hidden   0
-#      option txpower  15
-#      option bgscan   enable
        option encryption none
-
 EOF
        done
 }