summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6afb13e)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28283
3c298f89-4303-0410-b956-
a3cf2f4a3e73
scan_broadcom() {
local device="$1"
local wds
scan_broadcom() {
local device="$1"
local wds
- local adhoc sta apmode mon
+ local adhoc sta apmode mon disabled
local adhoc_if sta_if ap_if mon_if
local _c=0
config_get vifs "$device" vifs
for vif in $vifs; do
local adhoc_if sta_if ap_if mon_if
local _c=0
config_get vifs "$device" vifs
for vif in $vifs; do
+ config_get_bool disabled "$vif" disabled 0
+ [ $disabled -eq 0 ] || continue
+
config_get mode "$vif" mode
_c=$(($_c + 1))
case "$mode" in
config_get mode "$vif" mode
_c=$(($_c + 1))
case "$mode" in
*aes|*AES) auth=4; wsec=4;;
*) auth=4; wsec=2;;
esac
*aes|*AES) auth=4; wsec=4;;
*) auth=4; wsec=2;;
esac
+ # group rekey interval
+ config_get rekey "$vif" wpa_group_rekey
+
eval "${vif}_key=\"\$key\""
eval "${vif}_key=\"\$key\""
- nasopts="-k \"\$${vif}_key\""
+ nasopts="-k \"\$${vif}_key\"${rekey:+ -g $rekey}"
wpa2*|WPA2*) auth=64; wsec=4;;
*) auth=2; wsec=2;;
esac
wpa2*|WPA2*) auth=64; wsec=4;;
*) auth=2; wsec=2;;
esac
+ # group rekey interval
+ config_get rekey "$vif" wpa_group_rekey
+
eval "${vif}_key=\"\$key\""
eval "${vif}_key=\"\$key\""
- nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}"
+ nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}${rekey:+ -g $rekey}"
;;
esac
append vif_do_up "wsec $wsec" "$N"
;;
esac
append vif_do_up "wsec $wsec" "$N"