diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 625f77f797..72c3ae88c2 100644
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -52,6 +52,11 @@ case "$FIRMWARE" in
 		ath10kcal_extract "radio" 4096 12064
 # 		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -1)
 		;;
+	d7800 |\
+	r7500v2 |\
+	r7800)
+		ath10kcal_extract "art" 4096 12064
+		;;
 	ea8500)
 		hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
 		ath10kcal_extract "art" 4096 12064
@@ -59,10 +64,6 @@ case "$FIRMWARE" in
 	nbg6817)
 		ath10kcal_extract "0:ART" 4096 12064
 		;;
-         r7500v2 |\
-         r7800)
-		ath10kcal_extract "art" 4096 12064
-		;;
 	vr2600v)
 		ath10kcal_extract "ART" 4096 12064
 		;;
@@ -74,6 +75,11 @@ case "$FIRMWARE" in
 		ath10kcal_extract "radio" 20480 12064
 # 		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 8) -2)
 		;;
+	d7800 |\
+	r7500v2 |\
+	r7800)
+		ath10kcal_extract "art" 20480 12064
+		;;
 	ea8500)
 		hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
 		ath10kcal_extract "art" 20480 12064
@@ -81,10 +87,6 @@ case "$FIRMWARE" in
 	nbg6817)
 		ath10kcal_extract "0:ART" 20480 12064
 		;;
-        r7500v2 |\
-        r7800)
-		ath10kcal_extract "art" 20480 12064
-		;;
 	vr2600v)
 		ath10kcal_extract "ART" 20480 12064
 		;;
diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index 3482a09b70..0da6e0be67 100644
--- a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -15,12 +15,14 @@ case "$board" in
 	c2600)
 		echo $(macaddr_add $(mtd_get_mac_binary default-mac 8)  $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
 		;;
-	ea8500)
-		echo $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress
-		;;
+	d7800 |\
+	r7500v2 |\	
 	r7800)
 		echo $(macaddr_add $(mtd_get_mac_binary art 6)  $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress
 		;;
+	ea8500)
+		echo $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress
+		;;
 	vr2600v)
 		echo $(macaddr_add $(mtd_get_mac_binary default-mac 0)  $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
 		;;