From: Mike Baker <mbm@openwrt.org>
Date: Wed, 4 Jul 2007 18:34:11 +0000 (+0000)
Subject: fix bug with ap+sta modes using wpa
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fyousong.git;a=commitdiff_plain;h=463ade84f973cf698847a97aca0ecaac1d031b60

fix bug with ap+sta modes using wpa

SVN-Revision: 7877
---

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index c6444d6725..8b02125822 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