diff --git a/patches-wlan-ap/0020-fix-axt1800-wifi-mac-detect.patch b/patches-wlan-ap/0020-fix-axt1800-wifi-mac-detect.patch
new file mode 100644
index 0000000..1f71385
--- /dev/null
+++ b/patches-wlan-ap/0020-fix-axt1800-wifi-mac-detect.patch
@@ -0,0 +1,53 @@
+From 15f6e1be7a0bb3d2ee4d68b37a44b149a2b19406 Mon Sep 17 00:00:00 2001
+From: "GL.iNet-Xinfa.Deng" <xinfa.deng@gl-inet.com>
+Date: Fri, 12 Aug 2022 10:38:58 +0800
+Subject: [PATCH] fix: axt1800 wifi mac detect
+
+---
+ .../base-files/etc/hotplug.d/firmware/10-ath11k-caldata  | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+index 9930f41..8a2254b 100755
+--- a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
++++ b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
+@@ -49,6 +49,17 @@ ath11k_generate_macs_ion4x() {
+ 	echo -ne \\x${wifimac2//:/\\x} >> /lib/firmware/ath11k-macs
+ }
+ 
++ath11k_generate_macs_gl_axt1800() {
++	mac=$(cat /proc/gl-hw-info/device_mac)
++	[ -z "$mac" ] && ath11k_generate_macs || {
++		touch /lib/firmware/ath11k-macs
++		mac1=$(macaddr_add $mac 2)
++		mac2=$(macaddr_add $mac 3)
++		echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath11k-macs
++		echo -ne \\x${mac1//:/\\x} >> /lib/firmware/ath11k-macs
++	}
++}
++
+ caldata_die() {
+         echo "caldata: " "$*"
+         exit 1
+@@ -98,6 +109,7 @@ case "$FIRMWARE" in
+ 	wallys,dr6018-v4|\
+ 	qcom,ipq6018-cp01|\
+ 	xiaomi,ax1800|\
++	glinet,axt1800|\
+ 	glinet,ax1800)
+                 caldata_extract "0:ART" 0x1000 0x20000  
+ 		;;
+@@ -164,6 +176,10 @@ ath11k-macs)
+ 	cig,wf194c)
+ 		ath11k_generate_macs_wf194
+ 		;;
++	glinet,ax1800|\
++	glinet,axt1800)
++		ath11k_generate_macs_gl_axt1800
++		;;
+ 	esac
+ 	;;
+ *)
+-- 
+2.7.4
+
diff --git a/patches-wlan-ap/0020-fix-axt1800-wifi-mac.patch b/patches-wlan-ap/0020-fix-axt1800-wifi-mac.patch
deleted file mode 100644
index 2a6e41c..0000000
--- a/patches-wlan-ap/0020-fix-axt1800-wifi-mac.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
-+++ b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
-@@ -98,7 +98,8 @@ case "$FIRMWARE" in
- 	wallys,dr6018-v4|\
- 	qcom,ipq6018-cp01|\
- 	xiaomi,ax1800|\
--	glinet,ax1800)
-+	glinet,ax1800|\
-+	glinet,axt1800)
-                 caldata_extract "0:ART" 0x1000 0x20000  
- 		;;
- 	esac