qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:32:49 +02:00
Code

wpa_supplicant.sh: always use parameters from the current section

Browse Source 
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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34716 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-12-16 13:23:37 +00:00
parent 63ec409d27
commit 2b38b9a3e6
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/network/services/hostapd/files/wpa_supplicant.sh
View File

@ -9,13 +9,8 @@ wpa_supplicant_setup_vif() {
local scan_ssid="1" local scan_ssid="1"
[ -n "$4" ] && freq="frequency=$4" [ -n "$4" ] && freq="frequency=$4"
# make sure we have the encryption type and the psk
[ -n "$enc" ] || {
config_get enc "$vif" encryption config_get enc "$vif" encryption
}
[ -n "$key" ] || {
config_get key "$vif" key config_get key "$vif" key
}
local net_cfg bridge local net_cfg bridge
config_get bridge "$vif" bridge config_get bridge "$vif" bridge