X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Fetc%2Fuci-defaults%2F02_network;h=7612857844b3a10c4ae909941de43910b06ee75c;hb=c138d727199b2e655a864f5e48b1b1d37a787bd2;hp=a8e5ef9d7ca52a454cc81cffcb28fac4645833fa;hpb=f788f62828eb835fd717922052d7c076465b39c8;p=15.05%2Fopenwrt.git diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index a8e5ef9d7c..7612857844 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -4,11 +4,6 @@ . /lib/ramips.sh . /lib/functions/uci-defaults.sh -if [ ! -x /usr/sbin/maccalc ]; then - echo "$0: maccalc not found!" - return -fi - ramips_setup_rt3x5x_vlans() { if [ ! -x /sbin/swconfig ]; then @@ -18,7 +13,6 @@ ramips_setup_rt3x5x_vlans() fi local wanports="" local lanports="" - swconfig dev rt305x set reset 1 for port in 5 4 3 2 1 0; do if [ `swconfig dev rt305x port $port get disable` = "1" ]; then continue @@ -43,19 +37,24 @@ ramips_setup_interfaces() case $board in 3g300m | \ + w150m | \ all0256n | \ all5002 | \ - broadway) + all5003 | \ + broadway | \ + dcs-930| \ + wnce2001) + ucidef_add_switch "switch0" "1" "0" ucidef_set_interface_lan "eth0" ;; - dir-615-h1 | \ - wl-330n) + 3g-6200nl | \ + wl-330n | \ + wmr300) ucidef_set_interface_lan "eth0.1" ;; 3g-6200n | \ - argus-atp52b | \ b2c | \ nw718 | \ psr-680w | \ @@ -65,13 +64,38 @@ ramips_setup_interfaces() ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ;; - dir-645) + 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" + ;; + + 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" + ;; + + asl26555) + 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_vlan "switch0" "2" "0 6t" ;; + 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" + ;; + + dir-610-a1 | \ + dir-300-b7 | \ + dir-320-b1 | \ + dir-615-h1 | \ + hlk-rm04 | \ mzk-w300nh2) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "switch0" "1" "1" @@ -79,8 +103,21 @@ ramips_setup_interfaces() ucidef_add_switch_vlan "switch0" "2" "4 6t" ;; + awm002-evb | \ + argus-atp52b | \ + dir-645 | \ f5d8235-v1 | \ f5d8235-v2 | \ + hg255d | \ + rt-n14u | \ + wrtnode | \ + ur-326n4g) + 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" + ;; + ur-336un) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ;; @@ -93,6 +130,7 @@ ramips_setup_interfaces() ucidef_add_switch_vlan "switch0" "2" "0 5t" ;; + ar725w | \ rt-n15 | \ wl-351) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" @@ -116,11 +154,16 @@ ramips_setup_interfaces() ucidef_add_switch_vlan "switch0" "2" "0t 5" ;; - freestation5 | \ wcr-150gn) - ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1" + 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" ;; + d105 | \ + na930 | \ + omni-emb-hpm|\ wli-tx4-ag300n) ucidef_set_interface_lan "eth0" ;; @@ -130,7 +173,7 @@ ramips_setup_interfaces() if [ -n "${RT3X5X}" ]; then ramips_setup_rt3x5x_vlans else - ucidef_set_interfaces_lan_wan "eth0" "eth1" + ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" fi ;; esac @@ -143,103 +186,65 @@ ramips_setup_macs() local wan_mac="" case $board in - all0256n | \ - all5002 | \ - dir-615-h1) - lan_mac=$(ramips_get_mac_binary factory 40) - ;; - 3g-6200n | \ - 3g300m | \ - air3gii | \ - argus-atp52b | \ - bc2 | \ - broadway | \ - f5d8235-v1 | \ - mzk-w300nh2 | \ - nw718 | \ - psr-680w | \ - rt-n15 | \ - sl-r7205 | \ - wl-351) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + br-6475nd) + lan_mac=$(mtd_get_mac_binary devdata 13) + wan_mac=$(mtd_get_mac_binary devdata 7) ;; w306r-v20) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5) + wan_mac=$(macaddr_add "$lan_mac" 5) ;; - rt-n13u | \ - fonera20n) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + tew-691gr) + wan_mac=$(macaddr_add "$lan_mac" 3) ;; - dir-300-b1 |\ - dir-300-b2 |\ - dir-600-b1) - lan_mac=$(ramips_get_mac_binary devdata 16388) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + tew-692gr) + wan_mac=$(macaddr_add "$lan_mac" 4) ;; - dir-620-a1) - lan_mac=$(ramips_get_mac_binary factory 4) - lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00") - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + m3 |\ + m4 |\ + x5 |\ + x8) + lan_mac=$(macaddr_add "$lan_mac" -1) ;; - dir-645) - lan_mac=$(ramips_get_mac_nvram nvram lanmac) - wan_mac=$(ramips_get_mac_nvram nvram wanmac) + dir-620-a1) + lan_mac=$(macaddr_setbit_la "$lan_mac") + wan_mac=$(macaddr_add "$lan_mac" 1) ;; - esr-9753 | \ - ur-336un) - lan_mac=$(ramips_get_mac_binary devdata 16388) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + cy-swr1100 | \ + dir-645) + lan_mac=$(mtd_get_mac_ascii nvram lanmac) + wan_mac=$(mtd_get_mac_ascii nvram wanmac) ;; nbg-419n | \ wcr-150gn) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(ramips_get_mac_binary factory 40) - ;; - - f5d8235-v2) - lan_mac=$(ramips_get_mac_binary "u-boot" 262148) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + wan_mac=$(mtd_get_mac_binary factory 40) ;; rt-n56u) - lan_mac=$(ramips_get_mac_binary factory 4) - wan_mac=$(ramips_get_mac_binary factory 32772) - ;; - - tew-691gr) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3) - ;; - - tew-692gr) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4) + wan_mac=$(mtd_get_mac_binary factory 32772) ;; all0239-3g | \ carambola | \ - w502u) - lan_mac=$(ramips_get_mac_binary factory 40) - wan_mac=$(ramips_get_mac_binary factory 46) + freestation5 | \ + w502u | \ + wnce2001) + wan_mac=$(mtd_get_mac_binary factory 46) ;; wl341v3) - lan_mac=$(ramips_get_mac_binary board-nvram 65440) - wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + lan_mac=$(mtd_get_mac_binary board-nvram 65440) + wan_mac=$(macaddr_add "$lan_mac" 1) ;; - wli-tx4-ag300n) - lan_mac=$(ramips_get_mac_binary factory 4) + *) + wan_mac=$(macaddr_add "$lan_mac" 1) ;; esac