From f4c3cfc620db16484fd85570c8215abc3b36dc82 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 Nov 2019 00:18:45 +0100 Subject: ramips: read label MAC address from flash instead of using phy0/phy1 This replaces all uses of $(cat /sys/class/ieee80211/phyX/macaddress) by retrieval from the proper flash locations. This will make 02_network independent of WiFi setup again. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/mt7621/base-files/etc/board.d/02_network | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/ramips/mt7621') diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index ae03dc71b1..0de3804cdb 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -188,7 +188,7 @@ ramips_setup_macs() asus,rt-ac65p|\ asus,rt-ac85p) wan_mac=$(mtd_get_mac_ascii u-boot-env et1macaddr) - label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) + label_mac=$(mtd_get_mac_binary factory 0x4) ;; buffalo,wsr-1166dhp) local index="$(find_mtd_index "board_data")" @@ -198,7 +198,7 @@ ramips_setup_macs() dlink,dir-860l-b1) lan_mac=$(mtd_get_mac_ascii factory lanmac) wan_mac=$(mtd_get_mac_ascii factory wanmac) - label_mac=$(cat /sys/class/ieee80211/phy1/macaddress) + label_mac=$(mtd_get_mac_binary radio 0x4) ;; edimax,rg21s) lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) @@ -241,12 +241,12 @@ ramips_setup_macs() ;; zbtlink,zbt-we1326) wan_mac=$(mtd_get_mac_binary factory 0xe006) - label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) + label_mac=$(mtd_get_mac_binary factory 0x4) ;; zbtlink,zbt-wg3526-16m|\ zbtlink,zbt-wg3526-32m) wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1) - label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) + label_mac=$(mtd_get_mac_binary factory 0x4) ;; esac -- cgit v1.2.3