diff options
| -rw-r--r-- | target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 13 | ||||
| -rwxr-xr-x | target/linux/ar71xx/base-files/etc/uci-defaults/02_network | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 0fd6813832..fa4b98c1c1 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -11,8 +11,6 @@ ath9k_eeprom_extract() { local count=$3 local mtd - . /lib/functions.sh - mtd=$(find_mtd_chardev $part) [ -n "$mtd" ] || \ ath9k_eeprom_die "no mtd device found for partition $part" @@ -21,9 +19,18 @@ ath9k_eeprom_extract() { ath9k_eeprom_die "failed to extract from $mtd" } +ath9k_patch_firmware_mac() { + local mac=$1 + + [ -z "$mac" ] && return + + macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6 +} + [ -e /lib/firmware/$FIRMWARE ] && exit 0 . /lib/ar71xx.sh +. /lib/functions.sh board=$(ar71xx_board_name) @@ -32,6 +39,7 @@ case "$FIRMWARE" in case $board in wndr4300) ath9k_eeprom_extract "caldata" 4096 2048 + ath9k_patch_firmware_mac $(mtd_get_mac_binary caldata 0) ;; *) ath9k_eeprom_die "board $board is not supported yet" @@ -43,6 +51,7 @@ case "$FIRMWARE" in case $board in wndr4300) ath9k_eeprom_extract "caldata" 20480 2048 + ath9k_patch_firmware_mac $(mtd_get_mac_binary caldata 12) ;; *) ath9k_eeprom_die "board $board is not supported yet" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 0819cb2426..49db21bdc1 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -211,6 +211,10 @@ wndr4300) ucidef_add_switch "switch0" "1" "1" ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4" ucidef_add_switch_vlan "switch0" "2" "0t 5" + mac_lan=$(mtd_get_mac_binary caldata 0) + [ -n "$mac_lan" ] && ucidef_set_interface_macaddr "lan" "$mac_lan" + mac_wan=$(mtd_get_mac_binary caldata 6) + [ -n "$mac_wan" ] && ucidef_set_interface_macaddr "wan" "$mac_wan" ;; all0305 |\ |