remove madwifi karma patch until it's fixed

[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 9198615..41a25a4 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -94,7 +94,7 @@ enable_atheros() {
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif
 
                [ "$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;;
                        pureg=0
                        case "$agmode" in
                                *b) agmode=11b;;


@@ -225,10 +225,15 @@ enable_atheros() {
                                        PSK|psk|PSK2|psk2)
                                                case "$enc" in
                                                        PSK|psk)
                                        PSK|psk|PSK2|psk2)
                                                case "$enc" in
                                                        PSK|psk)

-                                                               proto='proto=WPA';;
+                                                               proto='proto=WPA'
+                                                               passphrase="${key}"
+                                                               ;;

                                                        PSK2|psk2)
                                                        PSK2|psk2)

-                                                               proto='proto=RSN';;
+                                                               proto='proto=RSN'
+                                                               passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+                                                               ;;

                                                esac
                                                esac

+                                               

                                                cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
 ctrl_interface=/var/run/wpa_supplicant
 network={
                                                cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
 ctrl_interface=/var/run/wpa_supplicant
 network={


@@ -236,7 +241,7 @@ network={
        ssid="$ssid"
        key_mgmt=WPA-PSK
        $proto
        ssid="$ssid"
        key_mgmt=WPA-PSK
        $proto

-       psk="$key"
+       psk="$passphrase"

 }
 EOF
                                        ;;
 }
 EOF
                                        ;;