From c92c0996f30fa0478fe52046fcef56f0d027aa5d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 20 Feb 2023 10:56:34 +0800 Subject: [PATCH] ipq807x: fix read mac addr for zte mf269 Signed-off-by: Tianling Shen --- target/linux/ipq807x/base-files/etc/board.d/02_network | 3 ++- .../ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network index 93948e9f6b..eca3fbe67b 100644 --- a/target/linux/ipq807x/base-files/etc/board.d/02_network +++ b/target/linux/ipq807x/base-files/etc/board.d/02_network @@ -50,7 +50,8 @@ ipq807x_setup_macs() case "$board" in zte,mf269) - wan_mac="$(get_mac_binary "$(find_mtd_chardev mac)" 0x20000)" + wan_mac="$(mtd_get_mac_binary mac 0x0)" + [ -n "$wan_mac" ] || wan_mac="$(get_mac_binary "$(find_mtd_chardev mac)" 0x20000)" lan_mac="$(macaddr_add "$wan_mac" 1)" label_mac="$wan_mac" ;; diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index c8a8c6ad2b..f5d7a064ab 100644 --- a/target/linux/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/ipq807x/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -11,7 +11,8 @@ board=$(board_name) case "$board" in zte,mf269) - mac_addr="$(get_mac_binary "$(find_mtd_chardev mac)" 0x20000)" + mac_addr="$(mtd_get_mac_binary mac 0x0)" + [ -n "$mac_addr" ] || mac_addr="$(get_mac_binary "$(find_mtd_chardev mac)" 0x20000)" [ "$PHYNBR" = "0" ] && macaddr_add "$mac_addr" 2 > "/sys${DEVPATH}/macaddress" [ "$PHYNBR" = "1" ] && macaddr_add "$mac_addr" 3 > "/sys${DEVPATH}/macaddress" ;;