fix bug with ap+sta modes using wpa
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7877 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
997dbd7345
commit
97f71bedd3
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue