Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ramips: read label MAC address from flash instead of using phy0/phy1

Browse source 
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 <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2019-11-11 00:18:45 +01:00
parent 4b81c1fd57
commit f4c3cfc620
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/ramips/mt7620/base-files/etc/board.d/02_network
View file

@ -288,7 +288,7 @@ ramips_setup_macs()
glinet,gl-mt300n|\ glinet,gl-mt300n|\
glinet,gl-mt750) glinet,gl-mt750)
wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1) 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)
;; ;;
hiwifi,hc5661|\ hiwifi,hc5661|\
hiwifi,hc5761|\ hiwifi,hc5761|\
@ -312,11 +312,11 @@ ramips_setup_macs()
wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR) wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
;; ;;
zbtlink,zbt-we1026-5g-16m) zbtlink,zbt-we1026-5g-16m)
label_mac=$(cat /sys/class/ieee80211/phy1/macaddress) label_mac=$(mtd_get_mac_binary factory 0x4)
;; ;;
zbtlink,zbt-we1026-h-32m) zbtlink,zbt-we1026-h-32m)
wan_mac=$(mtd_get_mac_binary factory 0x2e) wan_mac=$(mtd_get_mac_binary factory 0x2e)
label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) label_mac=$(mtd_get_mac_binary factory 0x4)
;; ;;
zyxel,keenetic-omni|\ zyxel,keenetic-omni|\
zyxel,keenetic-omni-ii|\ zyxel,keenetic-omni-ii|\

8
target/linux/ramips/mt7621/base-files/etc/board.d/02_network
View file

@ -188,7 +188,7 @@ ramips_setup_macs()
asus,rt-ac65p|\ asus,rt-ac65p|\
asus,rt-ac85p) asus,rt-ac85p)
wan_mac=$(mtd_get_mac_ascii u-boot-env et1macaddr) 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) buffalo,wsr-1166dhp)
local index="$(find_mtd_index "board_data")" local index="$(find_mtd_index "board_data")"
@ -198,7 +198,7 @@ ramips_setup_macs()
dlink,dir-860l-b1) dlink,dir-860l-b1)
lan_mac=$(mtd_get_mac_ascii factory lanmac) lan_mac=$(mtd_get_mac_ascii factory lanmac)
wan_mac=$(mtd_get_mac_ascii factory wanmac) 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) edimax,rg21s)
lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
@ -241,12 +241,12 @@ ramips_setup_macs()
;; ;;
zbtlink,zbt-we1326) zbtlink,zbt-we1326)
wan_mac=$(mtd_get_mac_binary factory 0xe006) 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-16m|\
zbtlink,zbt-wg3526-32m) zbtlink,zbt-wg3526-32m)
wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1) 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 esac

4
target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
View file

@ -134,7 +134,7 @@ ramips_setup_macs()
;; ;;
cudy,wr1000) cudy,wr1000)
wan_mac=$(mtd_get_mac_binary factory 0x2e) wan_mac=$(mtd_get_mac_binary factory 0x2e)
label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) label_mac=$(mtd_get_mac_binary factory 0x8)
;; ;;
duzun,dm06|\ duzun,dm06|\
mediatek,mt7628an-eval-board|\ mediatek,mt7628an-eval-board|\
@ -192,7 +192,7 @@ ramips_setup_macs()
;; ;;
vocore,vocore2|\ vocore,vocore2|\
vocore,vocore2-lite) vocore,vocore2-lite)
label_mac=$(cat /sys/class/ieee80211/phy0/macaddress) label_mac=$(mtd_get_mac_binary factory 0x8)
;; ;;
esac esac

7
target/linux/ramips/rt305x/base-files/etc/board.d/02_network
View file

@ -242,10 +242,13 @@ ramips_setup_macs()
lan_mac=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)") lan_mac=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)")
wan_mac=$(macaddr_add "$lan_mac" 1) wan_mac=$(macaddr_add "$lan_mac" 1)
;; ;;
dlink,dir-615-d|\ dlink,dir-615-d)
wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1)
label_mac=$(mtd_get_mac_binary devdata 0x4004)
;;
dlink,dir-615-h1) dlink,dir-615-h1)
wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1) 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)
;; ;;
poray,m3|\ poray,m3|\
poray,m4-4m|\ poray,m4-4m|\