From 1846f1a04155c1b615723d142d6141eb1a6467c1 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Sun, 17 Nov 2019 02:33:58 -0800
Subject: [PATCH 1/2] hostapd: add IEEE 802.11k support

---
 package/network/services/hostapd/Config.in    |  1 -
 .../network/services/hostapd/files/hostapd.sh | 22 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
index 9ce4b243cc..9dfa44e313 100644
--- a/package/network/services/hostapd/Config.in
+++ b/package/network/services/hostapd/Config.in
@@ -52,7 +52,6 @@ config WPA_WOLFSSL
 	        PACKAGE_wpad-mesh-wolfssl ||\
 	        PACKAGE_eapol-test-wolfssl
 	select WOLFSSL_HAS_AES_CCM
-	select WOLFSSL_HAS_AES_GCM
 	select WOLFSSL_HAS_ARC4
 	select WOLFSSL_HAS_DH
 	select WOLFSSL_HAS_OCSP
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 8da8539e8a..3c1504ca60 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -223,6 +223,8 @@ hostapd_common_add_bss_config() {
 	config_add_int time_advertisement
 	config_add_string time_zone
 
+	config_add_boolean ieee80211k rrm_neighbor_report rrm_beacon_report
+
 	config_add_boolean ieee80211r pmk_r1_push ft_psk_generate_local ft_over_ds
 	config_add_int r0_key_lifetime reassociation_deadline
 	config_add_string mobility_domain r1_key_holder
@@ -489,6 +491,17 @@ hostapd_set_bss_options() {
 		append bss_conf "bss_transition=$bss_transition" "$N"
 	fi
 
+	json_get_vars ieee80211k
+	set_default ieee80211k 0
+	if [ "$ieee80211k" -eq "1" ]; then
+		json_get_vars rrm_neighbor_report rrm_beacon_report
+
+		set_default rrm_neighbor_report 1
+		set_default rrm_beacon_report 1
+		append bss_conf "rrm_neighbor_report=$rrm_neighbor_report" "$N"
+		append bss_conf "rrm_beacon_report=$rrm_beacon_report" "$N"
+	fi
+
 	if [ "$wpa" -ge "1" ]; then
 		json_get_vars ieee80211r
 		set_default ieee80211r 0
@@ -540,7 +553,14 @@ hostapd_set_bss_options() {
 			append bss_conf "rsn_preauth=1" "$N"
 			append bss_conf "rsn_preauth_interfaces=$network_bridge" "$N"
 		else
-			set_default auth_cache 0
+			case "$auth_type" in
+			sae|psk-sae|owe)
+				set_default auth_cache 1
+			;;
+			*)
+				set_default auth_cache 0
+			;;
+			esac
 		fi
 
 		append bss_conf "okc=$auth_cache" "$N"

From 277b23f83c7e088e13c5d9e1f5a63360948e689e Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sun, 17 Nov 2019 20:07:34 +0800
Subject: [PATCH 2/2] fix r619ac  wan mac and lan reverse

fixed wan mac and lan reverse
---
 target/linux/ipq40xx/base-files/etc/board.d/02_network | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 6ae18cdbb8..a9fb9c6027 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -16,6 +16,7 @@ ipq40xx_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0t@eth0" "4:lan" "5:wan"
 		;;
+	p2w,r619ac|\
 	zyxel,nbg6617)
 		ucidef_add_switch "switch0" \
 			"0t@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan:5"
@@ -30,7 +31,6 @@ ipq40xx_setup_interfaces()
 		ucidef_add_switch "switch0" \
                         "0t@eth0" "5:wan" "3:lan"
 		;;
-	p2w,r619ac|\
 	asus,rt-acrh17|\
 	asus,rt-ac58u|\
 	avm,fritzbox-4040|\
@@ -64,7 +64,8 @@ ipq40xx_setup_macs()
 
 	case "$board" in
 	asus,rt-acrh17|\
-	asus,rt-ac58u)
+	asus,rt-ac58u|\
+	p2w,r619ac)
 		CI_UBIPART=UBI_DEV
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 1)