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 | 97f71bedd395deec315c23e379ffd0d4437bd5c9 (patch) | |
| tree | 65bac63760418f21154bff5a549ce0725e33e631 /package/broadcom-wl/files | |
| parent | 997dbd7345475251b19d5689132c7b3daee20090 (diff) | |
| download | upstream-97f71bedd395deec315c23e379ffd0d4437bd5c9.tar.gz upstream-97f71bedd395deec315c23e379ffd0d4437bd5c9.tar.bz2 upstream-97f71bedd395deec315c23e379ffd0d4437bd5c9.zip | |
fix bug with ap+sta modes using wpa
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7877 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/broadcom-wl/files')
| -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 |