X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1a1cc0d6d38b1d35c3a9f3afeed5e7950b493aaa..f3c0d1bebb17d61208521a102a282ce85d672a0b:/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 f4d521396..0f639e1bc 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -236,15 +236,21 @@ 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
 				eap_r=1
-				config_get key "$vif" key
-				config_get server "$vif" server
-				config_get port "$vif" port
+				config_get auth_server "$vif" auth_server
+				[ -z "$auth_server" ] && config_get auth_server "$vif" server
+				config_get auth_port "$vif" auth_port
+				[ -z "$auth_port" ] && config_get auth_port "$vif" port
+				config_get auth_secret "$vif" auth_secret
+				[ -z "$auth_secret" ] && config_get auth_secret "$vif" key
 
 				# wpa version + default cipher
 				case "$enc" in
@@ -260,8 +266,11 @@ enable_broadcom() {
 					*tkip*) wsec=2;;
 				esac
 
-				eval "${vif}_key=\"\$key\""
-				nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}"
+				# group rekey interval
+				config_get rekey "$vif" wpa_group_rekey
+
+				eval "${vif}_key=\"\$auth_secret\""
+				nasopts="-r \"\$${vif}_key\" -h $auth_server -p ${auth_port:-1812}${rekey:+ -g $rekey}"
 			;;
 		esac
 		append vif_do_up "wsec $wsec" "$N"