Several devices use ath10kcal_patch_mac, although all ath10k
eeproms have a checksum field and should use
ath10kcal_patch_mac_crc.
This might be because the field is not evaluated by the firmware at
the moment.

Nevertheless, this patch will use ath10kcal_patch_mac_crc for all
devices so the correct checksum is in place.

Signed-off-by: Adrian Schmutzler <freif...@adrianschmutzler.de>

---

v2: New patch
---
 .../etc/hotplug.d/firmware/11-ath10k-caldata  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

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 3175d5a1f8..802ef4039e 100644
--- 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
@@ -26,33 +26,33 @@ case "$FIRMWARE" in
                ;;
        dlink,dir-859-a1)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac")
+               ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata "wlan5mac")
                ;;
        elecom,wrc-1750ghbk2-i)
                caldata_extract "art" 0x5000 0x844
                ;;
        engenius,ecb1750)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(mtd_get_mac_ascii u-boot-env athaddr)
+               ath10kcal_patch_mac_crc $(mtd_get_mac_ascii u-boot-env athaddr)
                ;;
        engenius,epg5000|\
        iodata,wn-ac1167dgr|\
        iodata,wn-ac1600dgr2)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii 
u-boot-env ethaddr) +1)
+               ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii 
u-boot-env ethaddr) +1)
                ;;
        engenius,ews511ap)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(cat 
/sys/class/net/eth0/address) +1)
+               ath10kcal_patch_mac_crc $(macaddr_add $(cat 
/sys/class/net/eth0/address) +1)
                ;;
        glinet,gl-ar750|\
        glinet,gl-ar750s)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) 
+1)
+               ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 
0x0) +1)
                ;;
        glinet,gl-x750)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) 
+2)
+               ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 
0x0) +2)
                ;;
        nec,wg800hp)
                caldata_extract "art" 0x5000 0x844
@@ -61,11 +61,11 @@ case "$FIRMWARE" in
        ocedo,koala|\
        ocedo,ursus)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(mtd_get_mac_binary art 0xc)
+               ath10kcal_patch_mac_crc $(mtd_get_mac_binary art 0xc)
                ;;
        openmesh,om5p-ac-v2)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(cat 
/sys/class/net/eth0/address) +16)
+               ath10kcal_patch_mac_crc $(macaddr_add $(cat 
/sys/class/net/eth0/address) +16)
                ;;
        qihoo,c301)
                caldata_extract "radiocfg" 0x5000 0x844
@@ -77,29 +77,29 @@ case "$FIRMWARE" in
        tplink,archer-c7-v5|\
        tplink,archer-c25-v1)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 
0x8) -1)
+               ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary info 
0x8) -1)
                ;;
        tplink,archer-c5-v1|\
        tplink,archer-c7-v2)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 
0x1fc00) -1)
+               ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary 
u-boot 0x1fc00) -1)
                ;;
        tplink,archer-d50-v1)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary romfile 
0xf100) +2)
+               ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary 
romfile 0xf100) +2)
                ;;
        tplink,re350k-v1)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary config 
0x10008) +2)
+               ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary 
config 0x10008) +2)
                ;;
        tplink,re355-v1|\
        tplink,re450-v1)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(cat 
/sys/class/net/eth0/address) -2)
+               ath10kcal_patch_mac_crc $(macaddr_add $(cat 
/sys/class/net/eth0/address) -2)
                ;;
        tplink,re450-v2)
                caldata_extract "art" 0x5000 0x844
-               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 
0x8) +1)
+               ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary info 
0x8) +1)
                ;;
        ubnt,unifiac-lite|\
        ubnt,unifiac-mesh|\
@@ -127,7 +127,7 @@ case "$FIRMWARE" in
        netgear,ex6400|\
        netgear,ex7300)
                caldata_extract "caldata" 0x5000 0x2f20
-               ath10kcal_patch_mac $(mtd_get_mac_binary caldata 0xc)
+               ath10kcal_patch_mac_crc $(mtd_get_mac_binary caldata 0xc)
                ;;
        phicomm,k2t)
                caldata_extract "art" 0x5000 0x2f20
-- 
2.20.1


_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to