From 9745de82d5febff46e8412d8f012043d97428151 Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Tue, 28 May 2024 09:35:28 +0100 Subject: [PATCH] qualcommax: ipq807x: use ath11k_patch_mac for SXK80 Use ath11k_patch_mac and ath11k_set_macflag functions for SXK80 Signed-off-by: Andrew Smith Link: https://github.com/openwrt/openwrt/pull/15732 Signed-off-by: Robert Marko --- .../etc/hotplug.d/firmware/11-ath11k-caldata | 12 ++++++++++-- .../etc/hotplug.d/ieee80211/11_fix_wifi_mac | 7 ------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata index 758b0d9a34..1170a35413 100644 --- a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata +++ b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata @@ -17,8 +17,6 @@ case "$FIRMWARE" in edgecore,eap102|\ edimax,cax1800|\ linksys,mx5300|\ - netgear,sxr80|\ - netgear,sxs80|\ netgear,wax218|\ qnap,301w|\ redmi,ax6|\ @@ -49,6 +47,16 @@ case "$FIRMWARE" in ath11k_patch_mac $(mtd_get_mac_binary boarddata1 0x6) 2 ath11k_set_macflag ;; + netgear,sxr80|\ + netgear,sxs80) + caldata_extract "0:art" 0x1000 0x20000 + label_mac=$(get_mac_label) + ath11k_patch_mac $(mtd_get_mac_binary boarddata1 0x0c) 0 + #boarddata1 doesn't have a MAC for the 2G interface + ath11k_patch_mac $(macaddr_setbit_la $label_mac) 1 + ath11k_patch_mac $(mtd_get_mac_binary boarddata1 0x12) 2 + ath11k_set_macflag + ;; netgear,wax620) caldata_extract "0:art" 0x1000 0x20000 label_mac=$(get_mac_label) diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index 75a548d1c6..80c07b8542 100644 --- a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -23,11 +23,4 @@ case "$board" in [ "$PHYNBR" = "0" ] && macaddr_add $(get_mac_label) 2 > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && macaddr_add $(get_mac_label) 3 > /sys${DEVPATH}/macaddress ;; - netgear,sxr80|\ - netgear,sxs80) - [ "$PHYNBR" = "0" ] && mtd_get_mac_binary boarddata1 0x0c > /sys${DEVPATH}/macaddress - #boarddata1 doesn't have a MAC for the 2G interface - [ "$PHYNBR" = "1" ] && macaddr_setbit_la $(get_mac_label) > /sys${DEVPATH}/macaddress - [ "$PHYNBR" = "2" ] && mtd_get_mac_binary boarddata1 0x12 > /sys${DEVPATH}/macaddress - ;; esac -- 2.30.2