From: Mathias Kresin <dev@kresin.me>
Date: Thu, 14 Jul 2016 16:15:48 +0000 (+0200)
Subject: lantiq: fix VGV7519 and VGV7510KW22 mac addresses
X-Git-Tag: v17.01.0-rc1~895
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=13208e89d033b7f9f6f09b76106def4cad890813;p=openwrt%2Fstaging%2Fchunkeey.git

lantiq: fix VGV7519 and VGV7510KW22 mac addresses

The VGV7510KW22 stock firmware uses the following mac-addresses:

lan      (ifno 1): AA:BB:CC:DD:EE:60
wlan     (ifno 2): AA:BB:CC:DD:EE:61
atm0     (ifno 3): AA:BB:CC:DD:EE:62
atm1/wan (ifno 4): AA:BB:CC:DD:EE:63

The VGV7519 stock firmware uses the following mac-addresses:

lan:  AA:BB:CC:DD:EE:EF
wlan: AA:BB:CC:DD:EE:EF
wan:  AA:BB:CC:DD:EE:EE

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network
index d824c66d1a..d9221dab86 100755
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -134,13 +134,13 @@ VR200v)
 	;;
 
 VGV7510KW22)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
 	ucidef_add_switch "switch0" \
 		"2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "6t@eth0"
 	;;
 
 VGV7519)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+	wan_mac=$(mtd_get_mac_binary board_config 22)
 	ucidef_add_switch "switch0" \
 		"0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "6t@eth0"
 	;;
@@ -183,3 +183,4 @@ ucidef_set_interface_wan "$interface_wan" "pppoe"
 board_config_flush
 
 exit 0
+
diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi
index 181e852dee..8af1db70c3 100644
--- a/target/linux/lantiq/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi
@@ -208,7 +208,7 @@
 		#size-cells = <0>;
 		reg = <1>;
 		mtd-mac-address = <&boardconfig 0x16>;
-		mtd-mac-address-increment = <2>;
+		mtd-mac-address-increment = <3>;
 		lantiq,wan;
 
 		ethernet@0 {
diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index 31b429ba02..a2242bb54d 100644
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -221,6 +221,7 @@
 		#size-cells = <0>;
 		reg = <0>;
 		mtd-mac-address = <&boardconfig 0x16>;
+		mtd-mac-address-increment = <1>;
 		lantiq,switch;
 
 		ethernet@0 {
@@ -255,7 +256,6 @@
 		#size-cells = <0>;
 		reg = <1>;
 		mtd-mac-address = <&boardconfig 0x16>;
-		mtd-mac-address-increment = <2>;
 		lantiq,wan;
 
 		ethernet@5 {