From a91b3456468bc8c0414efde25219a1c0963a4999 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 4 Jul 2007 18:34:11 +0000
Subject: [PATCH] fix bug with ap+sta modes using wpa
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7877 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/broadcom-wl/files/lib/wifi/broadcom.sh | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index c6444d672..8b0212582 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -200,17 +200,18 @@ enable_broadcom() {
}
[ -z "$nasopts" ] || {
eval "${vif}_ssid=\"\$ssid\""
- mode="-A"
- [ "$ap" = "0" ] && {
- mode="-S"
+ nas_mode="-A"
+ use_nas=1
+ [ "$mode" = "sta" ] && {
+ nas_mode="-S"
[ -z "$bridge" ] || {
append vif_pre_up "supplicant 1" "$N"
append vif_pre_up "passphrase $key" "$N"
- nas=""
+ use_nas=0
}
}
- [ -z "$nas" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+ [ -z "$nas" -o "$use_nas" = "0" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
}
_c=$(($_c + 1))
done