aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-12-05 15:08:25 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-12-05 15:08:25 +0000
commit6da667f886bef06d2da669c66d86b292550096df (patch)
treed40460c7fe1f8a677737919a9b03a87684e8be63 /package
parent03ca3bf5bb3705674daef6e36fdcde79403d4ecd (diff)
downloadupstream-6da667f886bef06d2da669c66d86b292550096df.tar.gz
upstream-6da667f886bef06d2da669c66d86b292550096df.tar.bz2
upstream-6da667f886bef06d2da669c66d86b292550096df.zip
mac80211: fix wpa handling in sta mode
SVN-Revision: 18662
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/files/lib/wifi/mac80211.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 7a3ed9a682..ef275729c6 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -176,10 +176,10 @@ enable_mac80211() {
case "$enc" in
wep)
config_get keymgmt "$vif" keymgmt
- if [ -e "$keymgmt" ]; then
+ if [ -n "$keymgmt" ]; then
for idx in 1 2 3 4; do
local zidx
- zidx = idx - 1
+ zidx = $((idx - 1))
config_get key "$vif" "key${idx}"
if [ -n "$key" ]; then
append keystring "${zidx}:${key} "
@@ -187,7 +187,7 @@ enable_mac80211() {
done
fi
;;
- wpa)
+ *wpa*|*psk*)
config_get key "$vif" key
;;
esac
@@ -240,7 +240,7 @@ enable_mac80211() {
config_get bssid "$vif" bssid
case "$enc" in
wep)
- if [ -e "$keymgmt" ]; then
+ if [ -n "$keymgmt" ]; then
[ -n "$keystring" ] &&
iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key "$keystring"
else
@@ -254,7 +254,7 @@ enable_mac80211() {
fi
fi
;;
- wpa*|psk*)
+ *wpa*|*psk*)
config_get key "$vif" key
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
wpa_supplicant_setup_vif "$vif" wext || {