From 71d945f93911217b3fc2d1d28e9fa59de8bbe72d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 13 Jun 2023 12:00:03 +0800 Subject: [PATCH] mediatek: fix setup wifi mac addr for 360 t7 Signed-off-by: Tianling Shen (cherry picked from commit 6420b7432f6effeaff66b31b7f6bfe0301bbce28) --- .../linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts | 4 ---- .../base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts index 9a24783aa5..8edf54a0af 100644 --- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7-ubootmod.dts @@ -249,8 +249,4 @@ status = "okay"; mediatek,mtd-eeprom = <&factory 0x0>; - - nvmem-cells = <&macaddr_factory_14>; - nvmem-cell-names = "mac-address-ascii"; - mac-address-increment = <2>; }; diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index c9f4b96dcc..b8bbe4f2f9 100644 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -36,12 +36,16 @@ case "$board" in addr=$(mtd_get_mac_ascii config2 wifi5gmac) [ "$PHYNBR" = "1" ] && echo $macaddr > /sys${DEVPATH}/macaddress ;; - qihoo,360t7|\ - qihoo,360t7-ubootmod) + qihoo,360t7) addr=$(mtd_get_mac_ascii factory lanMac) [ "$PHYNBR" = "0" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress [ "$PHYNBR" = "1" ] && macaddr_add $addr 3 > /sys${DEVPATH}/macaddress ;; + qihoo,360t7-ubootmod) + addr=$(cat /sys/class/net/eth0/address) + [ "$PHYNBR" = "0" ] && macaddr_add $addr 2 > /sys${DEVPATH}/macaddress + [ "$PHYNBR" = "1" ] && macaddr_add $addr 3 > /sys${DEVPATH}/macaddress + ;; tplink,tl-xdr4288|\ tplink,tl-xdr6086|\ tplink,tl-xdr6088)