diff options
| author | Mike Baker <mbm@openwrt.org> | 2007-07-04 18:34:11 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2007-07-04 18:34:11 +0000 |
| commit | 463ade84f973cf698847a97aca0ecaac1d031b60 (patch) | |
| tree | c2c53fbebe3530d19573a1556deaa3a3bf47f370 | |
| parent | af7a203b768868d96071c29fb8a4230a78c3d270 (diff) | |
| download | upstream-463ade84f973cf698847a97aca0ecaac1d031b60.tar.gz upstream-463ade84f973cf698847a97aca0ecaac1d031b60.tar.bz2 upstream-463ade84f973cf698847a97aca0ecaac1d031b60.zip | |
fix bug with ap+sta modes using wpa
SVN-Revision: 7877
| -rw-r--r-- | package/broadcom-wl/files/lib/wifi/broadcom.sh | 11 |
1 files 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 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 |