X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Fetc%2Fboard.d%2F02_network;h=dbb5fb43e01a289832ac646f85f4276f6dea03f8;hb=5fba0f0c0c873e0d7179225273ceac89a5d39914;hp=21e36417784987f70a459471e8e087492eb005ca;hpb=3760b95702b65de9d6d0f6a1029a654e3b11f72f;p=openwrt%2Fopenwrt.git 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 21e3641778..dbb5fb43e0 100755 --- 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() @@ -19,26 +19,23 @@ ramips_setup_rt3x5x_vlans() continue fi if [ `swconfig dev rt305x port $port get lan` = "0" ]; then - wanports="$port $wanports" + wanports="$port:wan $wanports" else - lanports="$port $lanports" + lanports="$port:lan $lanports" fi done ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "rt305x" "1" "1" - ucidef_add_switch_vlan "rt305x" "1" "$lanports 6t" - ucidef_add_switch_vlan "rt305x" "2" "$wanports 6t" + ucidef_add_switch "rt305x" $lanports $wanports "6@eth0" } ramips_setup_interfaces() { local board="$1" - ucidef_set_interface_loopback - case $board in 3g150b|\ 3g300m|\ + a5-v11|\ all0256n|\ all5002|\ all5003|\ @@ -48,12 +45,16 @@ ramips_setup_interfaces() ht-tm02|\ linkits7688 | \ linkits7688d | \ + m2m|\ microwrt|\ + mpr-a2|\ ncs601w|\ w150m|\ + widora-neo|\ wnce2001|\ zte-q7) - ucidef_add_switch "switch0" "1" "0" + ucidef_add_switch "switch0" + ucidef_add_switch_attr "switch0" "enable" "false" ucidef_set_interface_lan "eth0" ;; 3g-6200nl|\ @@ -71,68 +72,74 @@ ramips_setup_interfaces() firewrt|\ hlk-rm04|\ miwifi-mini|\ + miwifi-nano|\ mt7621|\ mt7628|\ mzk-750dhp|\ mzk-w300nh2|\ oy-0001|\ pbr-m1|\ + psg1208|\ sap-g3200u3|\ + sk-wb8|\ + wf-2881|\ whr-300hp2|\ whr-600d|\ + witi|\ + wndr3700v5|\ wsr-1166|\ wsr-600|\ wt1520|\ - y1) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t" - ucidef_add_switch_vlan "switch0" "2" "4 6t" - ;; - a5-v11) - ucidef_set_interface_lan "eth0.1" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 6t" + y1|\ + zbt-wg2626|\ + zbt-wg3526|\ + youku-yk1) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@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_vlan "switch0" "1" "0 1 2 3 5t" - ucidef_add_switch_vlan "switch0" "2" "4 5t" + 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_vlan "switch0" "1" "1 2 3 4 6t" + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0" ;; atp-52b|\ awm002-evb|\ awm003-evb|\ + c50|\ dir-645|\ dir-860l-b1|\ f5d8235-v1|\ f5d8235-v2|\ + gl-mt300a|\ + gl-mt300n|\ + gl-mt750|\ hg255d|\ + mzk-wdpr|\ + jhr-n805r|\ + jhr-n825r|\ + jhr-n926r|\ rt-n14u|\ + ubnt-erx|\ ur-326n4g|\ wrtnode|\ + wrtnode2p | \ + wrtnode2r | \ wt3020|\ zbt-wa05) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t" - ucidef_add_switch_vlan "switch0" "2" "0 6t" + 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_vlan "switch0" "1" "0 6t" - ucidef_add_switch_vlan "switch0" "2" "1 6t" + ucidef_add_switch "switch0" \ + "0:lan" "1:wan" "6@eth0" ;; b2c|\ nw718|\ @@ -144,45 +151,41 @@ 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_vlan "switch0" "1" "1 2 3 4 9t" - ucidef_add_switch_vlan "switch0" "2" "0 9t" + 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_vlan "switch0" "1" "4 6t" + cf-wr800n|\ + ex2700) + 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_vlan "switch0" "1" "0 1 2 3 9t" - ucidef_add_switch_vlan "switch0" "2" "4 9t" + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "9@eth0" ;; + cs-qr10|\ d105|\ hpm|\ + mzk-ex300np|\ + mzk-ex750np|\ na930|\ - wli-tx4-ag300n) + wli-tx4-ag300n|\ + wrh-300cr) ucidef_set_interface_lan "eth0" ;; + duzun-dm06) + ucidef_add_switch "switch0" \ + "1:lan" "0:wan" "6@eth0" + ;; e1700|\ mt7620a_mt7530) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch1" "1" "1" - ucidef_add_switch_vlan "switch1" "1" "0 1 2 3 6t" - ucidef_add_switch_vlan "switch1" "2" "4 6t" + 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_vlan "switch0" "1" "1 2 3 4 5 6t" - ucidef_add_switch_vlan "switch0" "2" "0 6t" - ;; - m2m) - ucidef_add_switch "switch0" "4" - ucidef_set_interface_lan "eth0" + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0" ;; mlwg2|\ wizard8800|\ @@ -192,53 +195,40 @@ ramips_setup_interfaces() ;; mzk-dp150n|\ vocore) - ucidef_set_interface_lan "eth0.1" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 4 6t" + 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_vlan "switch0" "1" "0 1 2 3 8t" - ucidef_add_switch_vlan "switch0" "2" "4 8t" + 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_vlan "switch0" "1" "0t 1 2 3 4" - ucidef_add_switch_vlan "switch0" "2" "0t 5" + 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_vlan "switch0" "1" "1 2 3 4 5t" - ucidef_add_switch_vlan "switch0" "2" "0 5t" + 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_vlan "switch0" "1" "0 6t" - ucidef_add_switch_vlan "switch0" "2" "6t" + 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_vlan "switch0" "1" "0 1 2 3 6t" - ucidef_add_switch_vlan "switch0" "2" "5 6t" + 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_vlan "switch0" "1" "1 2 6t" - ucidef_add_switch_vlan "switch0" "2" "0 6t" + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "0:wan" "6@eth0" ;; + zbt-ape522ii|\ + zbt-we826|\ zbt-wr8305rt) - ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" - ucidef_add_switch "switch0" "1" "1" - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4 6t" - ucidef_add_switch_vlan "switch0" "2" "4 6t" + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" ;; *) RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"` @@ -259,6 +249,16 @@ ramips_setup_macs() case $board in a5-v11|\ + ht-tm02) + lan_mac=$(cat /sys/class/net/eth0/address) + ;; + all0239-3g|\ + carambola|\ + freestation5|\ + w502u|\ + wnce2001) + wan_mac=$(mtd_get_mac_binary factory 46) + ;; bc2|\ broadway|\ d105|\ @@ -269,7 +269,6 @@ ramips_setup_macs() freestation5|\ hlk-rm04|\ mpr-a1|\ - mpr-a2|\ psr-680w|\ sl-r7205|\ y1|\ @@ -278,13 +277,6 @@ ramips_setup_macs() lan_mac=$(macaddr_setbit_la "$lan_mac") wan_mac=$(macaddr_add "$lan_mac" 1) ;; - all0239-3g|\ - carambola|\ - freestation5|\ - w502u|\ - wnce2001) - wan_mac=$(mtd_get_mac_binary factory 46) - ;; br-6475nd) lan_mac=$(cat /sys/class/net/eth0/address) wan_mac=$(mtd_get_mac_binary devdata 7) @@ -302,9 +294,6 @@ ramips_setup_macs() [ -n "$lan_mac" ] || lan_mac=$(cat /sys/class/net/eth0/address) wan_mac=$(macaddr_add "$lan_mac" 1) ;; - ht-tm02) - lan_mac=$(cat /sys/class/net/eth0/address) - ;; linkits7688 | \ linkits7688d) wan_mac=$(mtd_get_mac_binary factory 4) @@ -326,6 +315,9 @@ ramips_setup_macs() lan_mac=$(macaddr_setbit_la "$lan_mac") wan_mac=$(mtd_get_mac_binary factory 32772) ;; + sk-wb8) + wan_mac=$(mtd_get_mac_binary factory 57350) + ;; tew-691gr) lan_mac=$(cat /sys/class/net/eth0/address) wan_mac=$(macaddr_add "$lan_mac" 3)