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/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)