all: drop old uci-defaults.sh

[openwrt/staging/rmilecki.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..a55c9eb24f8da908201fb149395441942a1bcb0c 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -2,7 +2,7 @@
 
 . /lib/functions.sh
 . /lib/ramips.sh
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/uci-defaults.sh
 . /lib/functions/system.sh
 
 ramips_setup_rt3x5x_vlans()
@@ -25,16 +25,13 @@ 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()
 {
        local board="$1"
 
-       ucidef_set_interface_loopback
-
        case $board in
        3g150b|\
        3g300m|\
@@ -52,7 +49,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|\
@@ -80,38 +78,31 @@ ramips_setup_interfaces()
        wf-2881|\
        whr-300hp2|\
        whr-600d|\
+       witi|\
        wsr-1166|\
        wsr-600|\
        wt1520|\
        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 +118,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 +135,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 +154,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 +175,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"
                ;;
        *)