don't overwrite device default for fast frames closes #2321

[openwrt/openwrt.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..83f35ab64e64969d73873a4d5a23c20ceddd2a67 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);;
@@ -49,6 +50,7 @@ scan_atheros() {
 disable_atheros() (
        local device="$1"
 
+       set_wifi_down "$device"
        # kill all running hostapd and wpa_supplicant processes that
        # are running on atheros vifs 
        for pid in `pidof hostapd wpa_supplicant`; do
@@ -69,10 +71,10 @@ disable_atheros() (
 )
 
 enable_atheros() {
+       local device="$1"
        config_get channel "$device" channel
        config_get vifs "$device" vifs
        
-       disable_atheros "$device"
        local first=1
        for vif in $vifs; do
                nosbeacon=
@@ -92,7 +94,7 @@ enable_atheros() {
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif
-                       config_get agmode "$device" mode
+                       config_get agmode "$device" agmode
                        pureg=0
                        case "$agmode" in
                                *b) agmode=11b;;
@@ -101,16 +103,22 @@ enable_atheros() {
                                *a) agmode=11a;;
                                *) agmode=auto;;
                        esac
-                       iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null 
+                       iwconfig "$ifname" channel "$channel" >/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 ff "$vif" ff
+               if [ -n "$ff" ]; then
+                       iwpriv "$ifname" ff "$ff"
+               fi
+
                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;
@@ -151,10 +159,8 @@ enable_atheros() {
                esac
                config_get ssid "$vif" ssid
 
-               [ "$mode" = "sta" ] && {
-                       config_get_bool bgscan "$vif" bgscan 1
-                       iwpriv "$ifname" bgscan "$bgscan"
-               }
+               config_get_bool bgscan "$vif" bgscan 0
+               iwpriv "$ifname" bgscan "$bgscan"
 
                config_get_bool antdiv "$device" diversity 1
                sysctl -w dev."$device".diversity="$antdiv" >&-
@@ -179,6 +185,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 
 
@@ -190,6 +206,7 @@ enable_atheros() {
                        start_net "$ifname" "$net_cfg"
                }
                iwconfig "$ifname" essid "$ssid"
+               set_wifi_up "$vif" "$ifname"
                case "$mode" in
                        ap)
                                config_get_bool isolate "$vif" isolate 0
@@ -210,10 +227,15 @@ enable_atheros() {
                                        PSK|psk|PSK2|psk2)
                                                case "$enc" in
                                                        PSK|psk)
-                                                               proto='proto=WPA';;
+                                                               proto='proto=WPA'
+                                                               passphrase="${key}"
+                                                               ;;
                                                        PSK2|psk2)
-                                                               proto='proto=RSN';;
+                                                               proto='proto=RSN'
+                                                               passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+                                                               ;;
                                                esac
+                                               
                                                cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
 ctrl_interface=/var/run/wpa_supplicant
 network={
@@ -221,7 +243,7 @@ network={
        ssid="$ssid"
        key_mgmt=WPA-PSK
        $proto
-       psk="$key"
+       psk="$passphrase"
 }
 EOF
                                        ;;
@@ -229,7 +251,7 @@ EOF
                                                #add wpa_supplicant calls here
                                        ;;
                                esac
-                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -Bw -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
                        ;;
                esac
                first=0
@@ -247,24 +269,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
 }