X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6110f74266cc1dfd5d1373c56fa720d8b35937d2..76b405fc143e5e5926bbced682f798a22486fab8:/package/madwifi/files/lib/wifi/madwifi.sh?ds=sidebyside

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 919861553..41a25a400 100755
--- 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
-			config_get agmode "$device" mode
+			config_get agmode "$device" agmode
 			pureg=0
 			case "$agmode" in
 				*b) agmode=11b;;
@@ -225,10 +225,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={
@@ -236,7 +241,7 @@ network={
 	ssid="$ssid"
 	key_mgmt=WPA-PSK
 	$proto
-	psk="$key"
+	psk="$passphrase"
 }
 EOF
 					;;