From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sat, 26 Jan 2019 16:59:44 +0000 (+0100)
Subject: ar71xx: Fix 5 GHz MAC address for Archer C60 v2
X-Git-Tag: v18.06.3~103
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc3eb970abc4d666735866c72951813d49d2a07f;p=oweals%2Fopenwrt.git

ar71xx: Fix 5 GHz MAC address for Archer C60 v2

Looks like C60 v2 needs the MAC address to be calculated
manually, while the C60 v1 gets it correctly without manual
interference.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com> [added id]
(cherry picked from commit 319c5d7c49503d1afbfb3164b18cf966e11fac6a)
---

diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 53f53775fd..d21d4134d4 100644
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -168,13 +168,18 @@ case "$FIRMWARE" in
 	archer-c58-v1|\
 	archer-c59-v1|\
 	archer-c60-v1|\
-	archer-c60-v2|\
 	cf-e355ac-v2|\
 	cf-e375ac)
 		ath10kcal_extract "art" 20480 12064
 		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
 			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
 		;;
+	archer-c60-v2)
+		ath10kcal_extract "art" 20480 12064
+		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
+			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
+		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
+		;;
 	cf-e385ac)
 		ath10kcal_extract "art" 20480 12064
 		;;