wpa_supplicant.sh: always use parameters from the current section

Using variables from the outer scope unnecessarily complicates the code and
leads to issues.

This patch fixes the bug when having an "adhoc" wifi-iface section before a
"sta" section prevents wpa_supplicant from using the key specified in the
corresponding section as it tries to use the "adhoc" key instead (1 by
default).

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Backport of r34716

SVN-Revision: 34717

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 5c4bd93d02d3774470de890a64ace6e0a7d7537c..cdca9b5539b3f78614e3acdf6b392e8a9b0e0a80 100644 (file)
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -9,13 +9,8 @@ wpa_supplicant_setup_vif() {
        local scan_ssid="1"
        [ -n "$4" ] && freq="frequency=$4"
 
-       # make sure we have the encryption type and the psk
-       [ -n "$enc" ] || {
-               config_get enc "$vif" encryption
-       }
-       [ -n "$key" ] || {
-               config_get key "$vif" key
-       }
+       config_get enc "$vif" encryption
+       config_get key "$vif" key
 
        local net_cfg bridge
        config_get bridge "$vif" bridge