[openwrt/openwrt] ramips: remove duplicate MAC assignment case

LEDE Commits lede-commits at lists.infradead.org
Mon Jun 29 09:56:25 EDT 2020


blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/5667ccbf1662a1a9f510637ed3a6718f3350a873

commit 5667ccbf1662a1a9f510637ed3a6718f3350a873
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Mon Jun 29 15:51:37 2020 +0200

    ramips: remove duplicate MAC assignment case
    
    Cudy WR1000 and Wavlink WL-WN577A2 store WAN as well as label MAC address
    at the same position in flash.
    
    Suggested-by: Sungbo Eo <mans0n at gorani.run>
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 target/linux/ramips/mt76x8/base-files/etc/board.d/02_network | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
index bdb5e5867b..a06e47a54b 100755
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
@@ -144,7 +144,8 @@ ramips_setup_macs()
 		wan_mac="$(grep -m1 mac= "/dev/mtd${index}" | cut -d= -f2)"
 		lan_mac=$wan_mac
 		;;
-	cudy,wr1000)
+	cudy,wr1000|\
+	wavlink,wl-wn577a2)
 		wan_mac=$(mtd_get_mac_binary factory 0x2e)
 		label_mac=$(mtd_get_mac_binary factory 0x4)
 		;;
@@ -188,10 +189,6 @@ ramips_setup_macs()
 	wiznet,wizfi630s)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x28)" 1)
 		;;
-	wavlink,wl-wn577a2)
-		wan_mac=$(mtd_get_mac_binary factory 0x2e)
-		label_mac=$(mtd_get_mac_binary factory 0x4)
-		;;
 	skylab,skw92a|\
 	totolink,lr1200)
 		wan_mac=$(mtd_get_mac_binary factory 0x2e)



More information about the lede-commits mailing list