lantiq: fix ARV7519RW22 switch port indexing

[openwrt/openwrt.git] / target / linux / lantiq / base-files / etc / board.d / 02_network

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 dad4458496e00cc9e62f82250dd93da940a08dda..6ab5cb979e847e896675144468279e55475f86fc 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -58,7 +58,7 @@ ARV7519PW)
 ARV7519RW22)
        wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 22)" 1)
        ucidef_add_switch "switch0" \
-               "0:lan" "2:lan" "3:lan" "4:lan" "5:lan" "6t@eth0"
+               "0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0"
        ;;
 
 BTHOMEHUBV2B)
@@ -75,7 +75,8 @@ BTHOMEHUBV3A)
        ;;
 
 BTHOMEHUBV5A)
-       wan_mac=$(macaddr_add "$(mtd_get_mac_binary caldata 4364)" 1)
+       lan_mac=$(mtd_get_mac_binary_ubi caldata 4364)
+       wan_mac=$(macaddr_add "$lan_mac" 1)
        ucidef_add_switch "switch0" \
                "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
        ;;
@@ -120,20 +121,27 @@ TDW8970|TDW8980)
                "0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0"
        ;;
 
+VG3503J)
+       lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
+       wan_mac=$(macaddr_add "$lan_mac" 1)
+       ucidef_add_switch "switch0" \
+               "2:lan:1" "4:lan:2" "6t@eth0"
+       ;;
+
 VR200v)
        wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 61696)" 1)
        ucidef_add_switch "switch0" \
                "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
        ;;
 
-VGV7510KW22)
-       wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+VGV7510KW22*)
+       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)
+VGV7519*)
+       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"
        ;;
@@ -147,7 +155,7 @@ WBMR300)
        lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr)
        wan_mac="$lan_mac"
        ucidef_add_switch "switch0" \
-               "2:lan:2" "3:lan:3" "5:lan:4" "4:wan:1" "6t@eth0"
+               "5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0"
        ;;
 
 *)
@@ -176,3 +184,4 @@ ucidef_set_interface_wan "$interface_wan" "pppoe"
 board_config_flush
 
 exit 0
+