[openwrt/openwrt] mediatek: filogic: move mac address setting together

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/30d84684cf2b574a63abd2b6f4e89c870be2d1af

commit 30d84684cf2b574a63abd2b6f4e89c870be2d1af
Author: Chukun Pan <amadeus at jmu.edu.cn>
AuthorDate: Mon Mar 20 23:08:01 2023 +0800

    mediatek: filogic: move mac address setting together
    
    Simultaneously sort in the order of letters.
    
    Signed-off-by: Chukun Pan <amadeus at jmu.edu.cn>
---
 .../linux/mediatek/filogic/base-files/etc/board.d/02_network   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index 730064695d..982d03deca 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -12,16 +12,15 @@ mediatek_setup_interfaces()
 		CI_UBIPART="UBI_DEV"
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "eth1"
 		;;
+	bananapi,bpi-r3)
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
+		;;
 	mediatek,mt7986a-rfb)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan6" "eth1 wan"
 		;;
 	mediatek,mt7986b-rfb)
 		ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1
 		;;
-	bananapi,bpi-r3)
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 sfp2" "eth1 wan"
-		ucidef_set_interface_macaddr "wan" "$(macaddr_add $(cat /sys/class/net/eth0/address) 1)"
-		;;
 	xiaomi,redmi-router-ax6000-stock|\
 	xiaomi,redmi-router-ax6000-ubootmod)
 		ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" wan
@@ -46,6 +45,9 @@ mediatek_setup_macs()
 		wan_mac="${addr}"
 		lan_mac="${addr}"
 		;;
+	bananapi,bpi-r3)
+		wan_mac=$(macaddr_add $(cat /sys/class/net/eth0/address) 1)
+		;;
 	xiaomi,redmi-router-ax6000-stock|\
 	xiaomi,redmi-router-ax6000-ubootmod)
 		wan_mac=$(mtd_get_mac_ascii Bdata ethaddr_wan)