From 369bc74ffdd2be8354e3d177ddd74b346afbcd42 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 22 Sep 2011 02:52:50 +0000
Subject: [PATCH] merge r28200 and r28208

SVN-Revision: 28283
---
 package/broadcom-wl/files/lib/wifi/broadcom.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 51dc0e3113..569e4e07fe 100644
--- 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"
-- 
2.30.2