[openwrt/openwrt] ath79: use correct MAC address for TP-Link TL-WPA8630 v2

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0348a02c7cda8206ed865b8218adfe40f2a5c0a2

commit 0348a02c7cda8206ed865b8218adfe40f2a5c0a2
Author: Sven Wegener <sven.wegener at stealer.net>
AuthorDate: Sat Apr 18 00:19:51 2020 +0200

    ath79: use correct MAC address for TP-Link TL-WPA8630 v2
    
    The base address is used for the LAN and 2G WLAN interfaces.
    5G WLAN interface is +1 and the PLC interface uses +2.
    
    Signed-off-by: Sven Wegener <sven.wegener at stealer.net>
    [improve commit title, fix assignment in 11-ath10k-caldata]
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 .../generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 1c93fe332c..66777cb9f5 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -193,11 +193,16 @@ case "$FIRMWARE" in
 	tplink,archer-c60-v2|\
 	tplink,archer-c60-v3|\
 	tplink,archer-c6-v2|\
-	tplink,archer-c6-v2-us|\
+	tplink,archer-c6-v2-us)
+		caldata_extract "art" 0x5000 0x2f20
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mac 0x8) -1)
+		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
+			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
+		;;
 	tplink,tl-wpa8630p-v2-eu|\
 	tplink,tl-wpa8630p-v2-int)
 		caldata_extract "art" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mac 0x8) -1)
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mac 0x8) +1)
 		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
 			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
 		;;