From: Adrian Schmutzler Date: Sun, 10 Nov 2019 23:22:33 +0000 (+0100) Subject: ath79: read label MAC address from flash instead of using phy0/phy1 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d421a8b9448968de0e3265f5beb469c210a909ab;p=openwrt%2Fstaging%2Fjogo.git ath79: 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. For future reference: The MAC addresses of the FRITZ!WLAN Repeater 300E can be extracted from the urlader key value store: maca *:6B macb *:6C macwlan *:6D macdsl *:6E and be set by e.g. addr=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 34f6e31047..3a896b55b0 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -292,11 +292,11 @@ ath79_setup_macs() ubnt,nanostation-m|\ ubnt,rocket-m|\ ubnt,unifi) - label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) + label_mac=$(mtd_get_mac_binary art 0x1002) ;; avm,fritz300e) lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)")) - label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) + label_mac=$(fritz_tffs -n macwlan -i $(find_mtd_part "tffs (1)")) ;; avm,fritz4020) lan_mac=$(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)"))