ar71xx: WNDR4300: Fix network vlan IDs

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

diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index a2bd6b11bcfed43bcfeb2e5c9206118523eb1204..a55e50affb779828af90e69b4413641660db7598 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -45,7 +45,6 @@ ar71xx_setup_interfaces()
        tl-wr741nd|\
        tl-wr741nd-v4|\
        tl-wr841n-v11|\
-       tl-wr841n-v7|\
        tl-wr841n-v9|\
        tl-wr842n-v3|\
        whr-g301n|\
@@ -53,7 +52,7 @@ ar71xx_setup_interfaces()
        whr-hp-gn|\
        wzr-hp-ag300h|\
        zbt-we1526)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
                ;;
@@ -66,10 +65,15 @@ ar71xx_setup_interfaces()
        bullet-m|\
        c-55|\
        cap4200ag|\
+       cf-e380ac-v1|\
+       cf-e380ac-v2|\
+       eap120|\
        eap300v2|\
        eap7660d|\
        el-mini|\
        loco-m-xw|\
+       mr12|\
+       mr16|\
        mr1750|\
        mr1750v2|\
        mr18|\
@@ -78,15 +82,20 @@ ar71xx_setup_interfaces()
        mr900|\
        mr900v2|\
        mynet-rext|\
+       pqi-air-pen|\
        rb-411|\
+       rb-411u|\
        rb-911g-2hpnd|\
        rb-911g-5hpacd|\
        rb-911g-5hpnd|\
        rb-912uag-2hpnd|\
        rb-912uag-5hpnd|\
+       rb-mapl-2nd|\
        rb-sxt2n|\
        rb-sxt5n|\
+       re450|\
        rocket-m-xw|\
+       sc300m |\
        tl-mr10u|\
        tl-mr11u|\
        tl-mr12u|\
@@ -100,29 +109,38 @@ ar71xx_setup_interfaces()
        tl-wa801nd-v2|\
        tl-wa830re-v2|\
        tl-wa850re|\
+       tl-wa850re-v2|\
        tl-wa901nd|\
        tl-wa901nd-v2|\
        tl-wa901nd-v3|\
        tl-wa901nd-v4|\
        tl-wr703n|\
+       tl-wr802n-v1|\
+       tl-wr802n-v2|\
        tube2h|\
        unifiac-lite|\
        wndap360|\
        wp543)
                ucidef_set_interface_lan "eth0"
                ;;
+       a40|\
+       a60|\
        alfa-ap96|\
        alfa-nx|\
-       ap83|\
        gl-ar150|\
        gl-ar300m|\
        gl-domino|\
        gl-inet|\
        gl-mifi|\
        jwap003|\
+       om2pv4|\
+       om2p-hsv4|\
        pb42|\
        pb44|\
+       rb-750-r2|\
+       rb-750up-r2|\
        rb-951ui-2hnd|\
+       rb-951ui-2nd|\
        routerstation|\
        tl-wr710n|\
        tl-wr720n-v3|\
@@ -141,8 +159,6 @@ ar71xx_setup_interfaces()
        ubnt-unifi-outdoor)
                ucidef_set_interface_lan "eth0 eth1"
                ;;
-       ap113|\
-       pb92|\
        wzr-hp-g300nh2)
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "2:wan"
@@ -160,10 +176,11 @@ ar71xx_setup_interfaces()
                ;;
        ap135-020|\
        ap136-020|\
+       bhr-4grv2|\
        tew-823dru|\
        tl-wr1043nd-v2|\
        wzr-450hp2)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0.2"
                ucidef_add_switch "switch0" \
                        "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "6@eth0"
                ;;
@@ -171,44 +188,61 @@ ar71xx_setup_interfaces()
        ap147-010|\
        nbg6616|\
        nbg6716)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1.2"
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"
                ;;
        ap143|\
        rb-433|\
        rb-433u)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "5@eth1"
                ;;
        archer-c5|\
        archer-c7|\
        tl-wdr4900-v2)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0.2"
                ucidef_add_switch "switch0" \
                        "0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
                ;;
+       archer-c59-v1|\
+       rb-450g)
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
+               ucidef_add_switch "switch0" \
+                       "0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
+               ;;
+       archer-c60-v1)
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
+               ucidef_add_switch "switch0" \
+                       "0@eth1" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4"
+               ;;
        arduino-yun|\
        dir-505-a1|\
        tl-wa801nd-v3)
                ucidef_set_interface_lan "eth1"
                ;;
        bsb)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
                ucidef_add_switch "switch0" \
                        "0@eth1" "1:lan" "3:lan"
                ;;
+       c-60)
+               ucidef_add_switch "switch0" \
+                       "0@eth0" "3:wan" "4:lan"
+               ;;
        cap324)
                ucidef_set_interface_lan "eth0" "dhcp"
                ;;
        cpe210|\
-       cpe510)
+       cpe510|\
+       wbs210|\
+       wbs510)
                ucidef_add_switch "switch0" \
                        "0@eth0" "5:lan" "4:wan"
                ;;
        cr3000)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
                ;;
@@ -219,11 +253,18 @@ ar71xx_setup_interfaces()
        dir-835-a1|\
        esr900|\
        mynet-n750|\
-       wndr3700v4|\
-       wndr4300)
+       sr3200|\
+       wndr3700v4)
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
                ;;
+       dap-2695-a1)
+               ucidef_add_switch "switch0" "0@eth0" "2:lan" "3:wan" "6@eth1"
+               ;;
+       rb-941-2nd)
+               ucidef_add_switch "switch0" \
+                       "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:wan:1"
+       ;;
        db120|\
        rb-2011l|\
        rb-2011uas|\
@@ -253,40 +294,47 @@ ar71xx_setup_interfaces()
        tl-mr3420-v2|\
        tl-wdr6500-v2|\
        tl-wr841n-v8|\
-       tl-wr842n-v2|\
+       tl-wr940n-v4|\
        tl-wr941nd-v5|\
        tl-wr941nd-v6|\
        wnr1000-v2|\
-       wnr2000-v3|\
        wnr2000-v4|\
        wnr2200|\
        wnr612-v2|\
        wpn824n)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
                ucidef_add_switch "switch0" \
-                       "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth1"
+                       "0@eth1" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4"
                ;;
        dir-825-b1|\
        nbg460n_550n_550nh|\
        tew-673gru|\
        wzr-hp-g300nh)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
                ;;
        dlan-pro-1200-ac)
                ucidef_set_interface_lan "eth0"
                ucidef_add_switch "switch0" \
-                       "0@eth0" "2:lan" "3:lan" "4:lan"
+                       "0u@eth0" "2:lan" "3:lan" "4:lan"
                ucidef_add_switch_attr "switch0" "enable" "false"
                ;;
+       ebr-2310-c1)
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+               ucidef_add_switch "switch0" \
+                       "0@eth0" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4"
+               ;;
        el-m150)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "3@eth1"
                ;;
+       dir-869-a1|\
        epg5000|\
-       esr1750)
+       esr1750|\
+       tl-wr1043nd-v4|\
+       wndr4300)
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
                ;;
@@ -295,22 +343,24 @@ ar71xx_setup_interfaces()
                        "0@eth0" "1:lan" "2:lan" "3:wan"
                ;;
        ew-dorin-router)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
                ucidef_add_switch "switch0" \
                        "0@eth0" "2:lan" "3:lan"
                ;;
+       dw33d|\
        f9k1115v2)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0.2"
                ucidef_add_switch "switch0" \
                        "2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" "0@eth0" "1:wan"
                ;;
-       gl-ar300)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+       gl-ar300|\
+       wnr2000-v3)
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
                ucidef_add_switch "switch0" \
                        "0@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
                ;;
        jwap230)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1.2"
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan" "5:wan" "6@eth1"
                ;;
@@ -322,23 +372,22 @@ ar71xx_setup_interfaces()
                ucidef_set_interface_lan "wlan0"
                ;;
        rb-435g)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
                ucidef_add_switch "switch0" \
                        "0@eth1" "1:lan" "2:lan"
                ;;
        rb-450)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
                ucidef_add_switch "switch0" \
-                       "0:lan" "1:lan" "2:lan" "3:lan" "5@eth1"
+                       "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth1"
                ;;
-       rb-450g|\
        routerstation-pro)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
                ucidef_add_switch "switch0" \
                        "0@eth1" "2:lan:3" "3:lan:2" "4:lan:1"
                ;;
        rb-493g)
-               ucidef_set_interfaces_lan_wan "eth0 eth1.1" "eth1.2"
+               ucidef_set_interfaces_lan_wan "eth0.1 eth1.1" "eth1.2"
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
                ucidef_add_switch "switch1" \
@@ -353,6 +402,10 @@ ar71xx_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
                ;;
+       tl-wpa8630)
+               ucidef_add_switch "switch0" \
+                       "0@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "5:lan:4"
+               ;;
        tl-wr1043nd)
                ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
@@ -366,19 +419,33 @@ ar71xx_setup_interfaces()
                ucidef_set_interface_raw "eth" "eth0"
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
                ;;
+       tl-wr841n-v7)
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+               ucidef_add_switch "switch0" \
+                       "0@eth0" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4"
+               ;;
+       tl-wr842n-v2)
+               ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
+               ucidef_add_switch "switch0" \
+                       "0@eth1" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3"
+               ;;
        uap-pro|\
        wpj342)
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan" "2:wan"
                ;;
-       unifiac-pro)
+       unifiac-pro|\
+       xd3200)
                ucidef_add_switch "switch0" \
                        "0@eth0" "2:lan" "3:wan"
                ;;
-       wndr3700)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+       wndr3700|\
+       wndr3700v2|\
+       wndr3800|\
+       wndr3800ch)
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
                ucidef_add_switch "switch0" \
-                       "0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
+                       "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0"
 
                ucidef_add_switch_attr "switch0" "blinkrate" 2
                ucidef_add_switch_port_attr "switch0" 1 led 6
@@ -394,7 +461,7 @@ ar71xx_setup_interfaces()
                        "5:lan" "1:wan" "6@eth0"
                ;;
        wrt160nl)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
                ucidef_add_switch "switch0" \
                        "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth0"
                ;;
@@ -403,7 +470,7 @@ ar71xx_setup_interfaces()
                        "0@eth0" "2:lan:1 3:lan:2 4:lan:3 5:lan:4" "1:wan"
                ;;
        z1)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
                ucidef_add_switch "switch0" \
                        "0@eth0" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4" "5:wan"
                ;;
@@ -431,9 +498,13 @@ ar71xx_setup_macs()
                lan_mac=$(mtd_get_mac_binary caldata 0)
                wan_mac=$(mtd_get_mac_binary caldata 6)
                ;;
+       tl-wr1043nd-v4)
+               wan_mac=$(mtd_get_mac_binary config 0x1017c)
+               ;;
        esr900)
                wan_mac=$(mtd_get_mac_ascii u-boot-env "wanaddr")
                ;;
+       dir-869-a1|\
        mynet-n750)
                wan_mac=$(mtd_get_mac_ascii devdata "wanmac")
                ;;