aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-12-16 13:23:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-12-16 13:23:37 +0000
commit056d75049d44f94ec356a2bb9e9718aaadbd35d5 (patch)
treeb5f63219154fbd4e44bf3a583582284d4d0f156c
parente9c0b958295bb055fefc03b1e356051f99218f28 (diff)
downloadupstream-056d75049d44f94ec356a2bb9e9718aaadbd35d5.tar.gz
upstream-056d75049d44f94ec356a2bb9e9718aaadbd35d5.tar.bz2
upstream-056d75049d44f94ec356a2bb9e9718aaadbd35d5.zip
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> SVN-Revision: 34716
-rw-r--r--package/network/services/hostapd/files/wpa_supplicant.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/package/network/services/hostapd/files/wpa_supplicant.sh b/package/network/services/hostapd/files/wpa_supplicant.sh
index 928243e425..127c5a70f5 100644
--- a/package/network/services/hostapd/files/wpa_supplicant.sh
+++ b/package/network/services/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