[backfire] merge r28200 and r28208

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28283 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 51dc0e3113fc2bca271f688d134d0ad72f9e7f31..569e4e07feb46709dd54071c6ce226b738101c6a 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -3,12 +3,15 @@ append DRIVERS "broadcom"
 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
+               config_get_bool disabled "$vif" disabled 0
+               [ $disabled -eq 0 ] || continue
+
                config_get mode "$vif" mode
                _c=$(($_c + 1))
                case "$mode" in
@@ -226,8 +229,11 @@ enable_broadcom() {
                                        *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\""
-                               nasopts="-k \"\$${vif}_key\""
+                               nasopts="-k \"\$${vif}_key\"${rekey:+ -g $rekey}"
                        ;;
                        *wpa*|*WPA*)
                                wsec_r=1
@@ -240,8 +246,11 @@ enable_broadcom() {
                                        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\""
-                               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"