[openwrt/openwrt] ath79: fix label_mac for NEC Aterm WG1200CR

LEDE Commits lede-commits at lists.infradead.org
Fri Apr 2 15:05:39 BST 2021


adrian pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/6f427580007f9cd25b7821644beb6f088d144ab2

commit 6f427580007f9cd25b7821644beb6f088d144ab2
Author: INAGAKI Hiroshi <musashino.open at gmail.com>
AuthorDate: Thu Mar 25 00:15:57 2021 +0900

    ath79: fix label_mac for NEC Aterm WG1200CR
    
    On NEC Aterm WG1200CR, the MAC address for WAN is printed in the label
    on the case, not LAN.
    This patch fixes this issue.
    
    Fixes: 50fdc0374b ("ath79: provide label MAC address")
    
    Signed-off-by: INAGAKI Hiroshi <musashino.open at gmail.com>
    (cherry picked from commit e2331fb5491e52e3e21ab18b58d064b344e093e5)
---
 target/linux/ath79/generic/base-files/etc/board.d/02_network | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 084e8536dd..1e522b91c6 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
@@ -526,8 +526,7 @@ ath79_setup_macs()
 		;;
 	dlink,dir-842-c1|\
 	dlink,dir-842-c2|\
-	dlink,dir-842-c3|\
-	nec,wg1200cr)
+	dlink,dir-842-c3)
 		lan_mac=$(mtd_get_mac_ascii devdata "lanmac")
 		wan_mac=$(mtd_get_mac_ascii devdata "wanmac")
 		label_mac=$lan_mac
@@ -588,6 +587,11 @@ ath79_setup_macs()
 		base_mac=$(mtd_get_mac_binary u-boot 0x1fc00)
 		wan_mac=$(macaddr_add "$base_mac" 1)
 		;;
+	nec,wg1200cr)
+		lan_mac=$(mtd_get_mac_ascii devdata "lanmac")
+		wan_mac=$(mtd_get_mac_ascii devdata "wanmac")
+		label_mac=$wan_mac
+		;;
 	nec,wg800hp)
 		lan_mac=$(mtd_get_mac_text board_data 0x280)
 		wan_mac=$(mtd_get_mac_text board_data 0x480)



More information about the lede-commits mailing list