X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5794fe5fc7363181e963637e2c7d98e056193e75..0eced37b72d7cf25fef2628fc0a14a22a01b28a4:/package/broadcom-wl/files/lib/wifi/broadcom.sh?ds=sidebyside

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index e22921732..8fe801d59 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
@@ -233,8 +236,11 @@ enable_broadcom() {
 					*tkip*) 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*)
 				wsec_r=1
@@ -257,8 +263,11 @@ enable_broadcom() {
 					*tkip*) 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"
@@ -363,7 +372,7 @@ detect_broadcom() {
 		cat <<EOF
 config wifi-device  wl${i}
 	option type     broadcom
-	option channel  5
+	option channel  11
 
 	# REMOVE THIS LINE TO ENABLE WIFI:
 	option disabled 1