fix bug with ap+sta modes using wpa

SVN-Revision: 7877
This commit is contained in:
Mike Baker 2007-07-04 18:34:11 +00:00
parent af7a203b76
commit 463ade84f9

View file

@ -200,17 +200,18 @@ enable_broadcom() {
} }
[ -z "$nasopts" ] || { [ -z "$nasopts" ] || {
eval "${vif}_ssid=\"\$ssid\"" eval "${vif}_ssid=\"\$ssid\""
mode="-A" nas_mode="-A"
[ "$ap" = "0" ] && { use_nas=1
mode="-S" [ "$mode" = "sta" ] && {
nas_mode="-S"
[ -z "$bridge" ] || { [ -z "$bridge" ] || {
append vif_pre_up "supplicant 1" "$N" append vif_pre_up "supplicant 1" "$N"
append vif_pre_up "passphrase $key" "$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)) _c=$(($_c + 1))
done done