From 263dd25c7fb897e0eb6a2281bf82ef2dc8aa82c5 Mon Sep 17 00:00:00 2001
From: jjm2473 <1129525450@qq.com>
Date: Thu, 24 Nov 2022 16:26:47 +0800
Subject: [PATCH] base: fix duplicated mac address on bridge members

---
 package/base-files/files/bin/config_generate              | 3 ++-
 .../rockchip/armv8/base-files/etc/board.d/02_network      | 2 +-
 .../rockchip/rk3568/base-files/etc/board.d/02_network     | 8 +++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 596fcf41fa..9afa1f8bb9 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -2,7 +2,7 @@
 
 CFG=/etc/board.json
 
-. /usr/share/libubox/jshn.sh
+. /lib/functions/system.sh
 
 [ -s $CFG ] || /bin/board_detect || exit 1
 [ -s /etc/config/network -a -s /etc/config/system ] && exit 0
@@ -123,6 +123,7 @@ generate_network() {
 					set network.@device[-1].name='$port'
 					set network.@device[-1].macaddr='$macaddr'
 				EOF
+				macaddr=$(macaddr_add "$macaddr" 2)
 			done
 		}
 		device=br-$1
diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
index ed7fc0c152..b57c3ebb8b 100755
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
@@ -57,7 +57,7 @@ rockchip_setup_macs()
 	case "$board" in
 	friendlyarm,nanopi-r2s)
 		wan_mac=$(generate_mac_from_mmc_cid)
-		lan_mac=$(macaddr_add "$wan_mac" +1)
+		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
 	friendlyarm,nanopi-r4s|\
 	friendlyarm,nanopi-r4se)
diff --git a/target/linux/rockchip/rk3568/base-files/etc/board.d/02_network b/target/linux/rockchip/rk3568/base-files/etc/board.d/02_network
index b530167502..25617bcb22 100755
--- a/target/linux/rockchip/rk3568/base-files/etc/board.d/02_network
+++ b/target/linux/rockchip/rk3568/base-files/etc/board.d/02_network
@@ -43,7 +43,6 @@ rockchip_setup_macs()
 	local board="$1"
 	local lan_mac=""
 	local wan_mac=""
-	local label_mac=""
 
 	case "$board" in
 	firefly,rk3568-roc-pc|\
@@ -51,14 +50,13 @@ rockchip_setup_macs()
 	fastrhino,r66s|\
 	rockchip,rk3568-lunzn-r68s|\
 	fastrhino,r68s)
-		lan_mac=$(generate_mac_from_mmc)
-		wan_mac=$(macaddr_add "$lan_mac" +1)
+		wan_mac=$(generate_mac_from_mmc)
+		lan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 	esac
 
-	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
 	[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
-	[ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac
+	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
 }
 
 board_config_update