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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20394 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index a9f8ca1322aa297ce76f7998e93d5d103bf5ca0e..b6499e6c68f54b941b089c46815de9be75c1988e 100644 (file)
--- 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
                ;;