ath79: really fix TP-Link Archer C7 v2 MAC address

Revert 290c54473ead ("ath79: fix TP-Link Archer C7 v2 wlan1 MAC address")
which obviously aims to have a distinct MAC address per interface.

Unfortunally it doesn't match what is used by the stock firmware and we
shouldn'z use MAC Adresses not reserverd for/assigned to a particular
board.

The correct MAC adress increments for this board are:

wlan0 (5GHz) : -1
wlan1 (2.4GHz) : 0
eth1 (LAN) : 0
eth0 (WAN) : 1

Fixes: FS#408
Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 240a1bf1dda2840dca9bd768ac04cdcfe1abddac..562237f191bb7172077916d717bf37c10208926a 100644 (file)
--- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -97,7 +97,7 @@ case "$FIRMWARE" in
                ;;
        "tplink,tl-archer-c7-v2")
                ath10kcal_extract "art" 20480 2116
-               ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
+               ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1)
                ;;
        "ubnt,unifiac-lite"|\
        "ubnt,unifiac-mesh"|\

diff --git a/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi b/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
index 546a5e33c3dac22584890945f0eadb1744e7fd69..6fb25a9d2e456f84e195891cabfb9d1c0d207b0d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
@@ -190,5 +190,4 @@
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
-       mtd-mac-address-increment = <(-1)>;
 };