make madwifi startup script aware of new iwpriv options

[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 5a25eddae20f2f4202e603910f4daedb99e0f928..5fa687e0cd04853cbd060eecf905cfeb3b4fa0af 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -197,6 +197,12 @@ enable_atheros() {
                config_get_bool comp "$vif" compression
                [ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
 
+               config_get_bool minrate "$vif" minrate
+               [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"
+
+               config_get_bool maxrate "$vif" maxrate
+               [ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate"
+
                config_get_bool burst "$vif" bursting
                [ -n "$burst" ] && iwpriv "$ifname" burst "$burst"
 
@@ -212,6 +218,9 @@ enable_atheros() {
                config_get_bool turbo "$vif" turbo
                [ -n "$turbo" ] && iwpriv "$ifname" turbo "$turbo"
 
+               config_get_bool doth "$vif" doth 0
+               [ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
+
                config_get maclist "$vif" maclist
                [ -n "$maclist" ] && {
                        # flush MAC list
@@ -263,26 +272,34 @@ enable_atheros() {
                                fi
                        ;;
                        wds|sta)
-                               case "$enc" in 
+                               config_get_bool usepassphrase "$vif" passphrase 1
+                               case "$enc" in
                                        PSK|psk|PSK2|psk2)
                                                case "$enc" in
                                                        PSK|psk)
                                                                proto='proto=WPA'
-                                                               passphrase="${key}"
+                                                               if [ "$usepassphrase" = "1" ]; then
+                                                                       passphrase="psk=\"${key}\""
+                                                               else
+                                                                       passphrase="psk=${key}"
+                                                               fi
                                                                ;;
                                                        PSK2|psk2)
                                                                proto='proto=RSN'
-                                                               passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+                                                                if [ "$usepassphrase" = "1" ]; then
+                                                                        passphrase="psk=\"${key}\""
+                                                                else
+                                                                        passphrase="psk=${key}"
+                                                                fi
                                                                ;;
                                                esac
-                                               
                                                cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
 network={
        scan_ssid=1
        ssid="$ssid"
        key_mgmt=WPA-PSK
        $proto
-       psk=$passphrase
+       $passphrase
 }
 EOF
                                        ;;