ar71xx/ipq806x/mediatek/mvebu: fix network defaults

After "73d923e base-files: emit tagged switch configuration by default"
some default network configurations are broken because the lan and wan
ifnames are forcibly set to untagged netdevs.

Adjust the offending set_interfaces_lan_wan() calls to use the proper
tagged device names.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

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 976440e6053345e713b2aba343b2d1dcf7af8696..f01e1bb61acd9021ec01ec4a6e6944eb3123f8c7 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -52,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"
                ;;
@@ -170,7 +170,7 @@ ar71xx_setup_interfaces()
        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"
                ;;
@@ -178,21 +178,21 @@ 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"
                ;;
@@ -207,7 +207,7 @@ ar71xx_setup_interfaces()
                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"
                ;;
@@ -226,7 +226,7 @@ ar71xx_setup_interfaces()
                        "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"
                ;;
@@ -287,7 +287,7 @@ ar71xx_setup_interfaces()
        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"
                ;;
@@ -295,18 +295,18 @@ ar71xx_setup_interfaces()
        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"
                ;;
        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"
                ;;
@@ -322,24 +322,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|\
        wnr2000-v3)
-               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" "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"
                ;;
@@ -351,27 +351,27 @@ 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:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth1"
                ;;
        rb-450g)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               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"
                ;;
        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" \
@@ -404,12 +404,12 @@ ar71xx_setup_interfaces()
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
                ;;
        tl-wr841n-v7)
-               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"
                ;;
        tl-wr842n-v2)
-               ucidef_set_interfaces_lan_wan "eth1" "eth0"
+               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"
                ;;
@@ -427,7 +427,7 @@ ar71xx_setup_interfaces()
        wndr3700v2|\
        wndr3800|\
        wndr3800ch)
-               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" "5@eth0"
 
@@ -445,7 +445,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"
                ;;
@@ -454,7 +454,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"
                ;;

diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
index 8417f0e9b767aecaf2477a7a57e38fb9f793caaa..52bb1629f7ba14f8799121a0c4437c1ef9a35da4 100755 (executable)
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -26,7 +26,7 @@ vr2600v)
 db149)
        ucidef_set_interface_lan "eth1 eth2 eth3"
        ucidef_add_switch "switch0" \
-               "1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0"
+               "1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
        ;;
 ea8500)
 

diff --git a/target/linux/mediatek/base-files/etc/board.d/02_network b/target/linux/mediatek/base-files/etc/board.d/02_network
index 1d1b5c021ad2ce513207bc0557f9f8cab0b85eda..2549ff954e836905b24ff7ea2589050a4392036f 100755 (executable)
--- a/target/linux/mediatek/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/base-files/etc/board.d/02_network
@@ -13,7 +13,7 @@ mediatek_setup_interfaces()
        eMMC | \
        NAND | \
        mt7623_evb)
-               ucidef_set_interfaces_lan_wan "eth0" "eth1"
+               ucidef_set_interfaces_lan_wan "eth0.1" "eth1.2"
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" "5@eth1"
                ;;

diff --git a/target/linux/mvebu/base-files/etc/board.d/02_network b/target/linux/mvebu/base-files/etc/board.d/02_network
index f4a87efc914b056b2111740b74e2f23cb7e134f6..d71fa9aac1860a7361b3b3bc45646ffca7932612 100755 (executable)
--- a/target/linux/mvebu/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/base-files/etc/board.d/02_network
@@ -17,7 +17,7 @@ armada-385-linksys-cobra|\
 armada-385-linksys-rango|\
 armada-385-linksys-shelby|\
 armada-xp-linksys-mamba)
-       ucidef_set_interfaces_lan_wan "eth0" "eth1"
+       ucidef_set_interfaces_lan_wan "eth0.1" "eth1.2"
        ucidef_add_switch "switch0" \
                "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth0" "4:wan" "6@eth1"
        ;;
@@ -31,7 +31,7 @@ armada-388-clearfog)
        ucidef_set_interfaces_lan_wan "eth0 eth1" "eth2"
        swconfig list 2>&1 | grep -q switch0 && \
                ucidef_add_switch "switch0" \
-                       "0:lan:5" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5@eth0" "6:lan:6"
+                       "0:lan:5" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5u@eth0" "6:lan:6"
        ;;
 *)
        ucidef_set_interface_lan "eth0"