From: Travis Kemen <thepeople@openwrt.org>
Date: Wed, 24 Mar 2010 00:19:42 +0000 (+0000)
Subject: Cleanup redundant psk handling code in wpa_supplicant.sh. (I sent this one to openwrt... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e74fbc183b6746cc5469f3347aef424296c50233;p=openwrt%2Fstaging%2Fneocturne.git

Cleanup redundant psk handling code in wpa_supplicant.sh. (I sent this one to openwrt-devel before, but I am resending it as part of this series because the next patch will also edit wpa_supplicant.sh).

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

SVN-Revision: 20394
---

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index a9f8ca1322..b6499e6c68 100644
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -50,22 +50,17 @@ wpa_supplicant_setup_vif() {
 		*psk*)
 			key_mgmt='WPA-PSK'
 			config_get_bool usepassphrase "$vif" passphrase 1
+			if [ "$usepassphrase" = "1" ]; then
+				passphrase="psk=\"${key}\""
+			else
+				passphrase="psk=${key}"
+			fi
 			case "$enc" in
 				*psk2*)
 					proto='proto=RSN'
-					if [ "$usepassphrase" = "1" ]; then
-						passphrase="psk=\"${key}\""
-					else
-						passphrase="psk=${key}"
-					fi
 				;;
 				*psk*)
 					proto='proto=WPA'
-					if [ "$usepassphrase" = "1" ]; then
-						passphrase="psk=\"${key}\""
-					else
-						passphrase="psk=${key}"
-					fi
 				;;
 			esac
 		;;