board.d: merge ucidef_add_switch() and ucidef_add_switch_ports()

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

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index c8bdc77a69f17976f4143d1f24eb62502c63cad3..3cfb6bac6687c2c8bfc0dd0a797c75c2e37e3bd0 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -25,8 +25,7 @@ ramips_setup_rt3x5x_vlans()
                fi
        done
        ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-       ucidef_add_switch "rt305x" "1" "1"
-       ucidef_add_switch_ports "rt305x" $lanports $wanports "6@eth0"
+       ucidef_add_switch "rt305x" $lanports $wanports "6@eth0"
 }
 
 ramips_setup_interfaces()
@@ -88,14 +87,12 @@ ramips_setup_interfaces()
        zbt-wg2626|\
        youku-yk1)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
                ;;
        a5-v11)
                ucidef_set_interface_lan "eth0.1"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "6t@eth0"
                ;;
        ar670w|\
@@ -103,16 +100,14 @@ ramips_setup_interfaces()
        rt-n15|\
        wl-351)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
                ;;
        asl26555|\
        re6500|\
        rp-n53)
                ucidef_set_interface_lan "eth0.1"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
                ;;
        atp-52b|\
@@ -129,14 +124,12 @@ ramips_setup_interfaces()
        wt3020|\
        zbt-wa05)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
                ;;
        awapn2403)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "1:wan" "6@eth0"
                ;;
        b2c|\
@@ -150,20 +143,17 @@ ramips_setup_interfaces()
                ;;
        br-6475nd)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
                ;;
        cf-wr800n)
                ucidef_set_interface_lan "eth0.1"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "4:lan" "6t@eth0"
                ;;
        cy-swr1100)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "9@eth0"
                ;;
        d105|\
@@ -175,15 +165,13 @@ ramips_setup_interfaces()
        e1700|\
        mt7620a_mt7530)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch1" "1" "1"
-               ucidef_add_switch_ports "switch1" \
+               ucidef_add_switch "switch1" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
                ;;
        hc5*61|\
        y1s)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
                ;;
        m2m)
@@ -200,52 +188,44 @@ ramips_setup_interfaces()
        mzk-dp150n|\
        vocore)
                ucidef_set_interface_lan "eth0.1"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "4:lan" "6t@eth0"
                ;;
        rt-n56u)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0"
                ;;
        tew-691gr|\
        tew-692gr)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0"
                ;;
        v11st-fe|\
        wzr-agl300nh)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
                ;;
        wcr-150gn)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "6t@eth0"
                ;;
        whr-1166d)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "5:wan" "6@eth0"
                ;;
        wizfi630a)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "1:lan" "2:lan" "0:wan" "6@eth0"
                ;;
        zbt-wr8305rt)
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-               ucidef_add_switch "switch0" "1" "1"
-               ucidef_add_switch_ports "switch0" \
+               ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
                ;;
        *)