board.d: remove redundant ucidef_set_interfaces_lan_wan() calls

[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 16e7b6fa13f548a6a265fb1d428f24b2154d2e36..f2c0edb576b06e6f2fafbac55e096e0a914375d6 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()
@@ -52,7 +51,8 @@ ramips_setup_interfaces()
        w150m|\
        wnce2001|\
        zte-q7)
-               ucidef_add_switch "switch0" "1" "0"
+               ucidef_add_switch "switch0"
+               ucidef_add_switch_attr "switch0" "reset" "false"
                ucidef_set_interface_lan "eth0"
                ;;
        3g-6200nl|\
@@ -86,32 +86,24 @@ ramips_setup_interfaces()
        y1|\
        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|\
        ar725w|\
        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|\
@@ -127,15 +119,11 @@ ramips_setup_interfaces()
        wrtnode|\
        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|\
@@ -148,21 +136,15 @@ ramips_setup_interfaces()
                ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
                ;;
        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|\
@@ -173,20 +155,17 @@ 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)
-               ucidef_add_switch "switch0" "4"
+               ucidef_add_switch "switch0"
+               ucidef_add_switch_attr "switch0" "reset" "false"
                ucidef_set_interface_lan "eth0"
                ;;
        mlwg2|\
@@ -197,53 +176,37 @@ 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"
                ;;
        *)