diff options
Diffstat (limited to 'target/linux/brcm47xx/base-files/etc/init.d/netconfig')
-rwxr-xr-x | target/linux/brcm47xx/base-files/etc/init.d/netconfig | 102 |
1 files changed, 61 insertions, 41 deletions
diff --git a/target/linux/brcm47xx/base-files/etc/init.d/netconfig b/target/linux/brcm47xx/base-files/etc/init.d/netconfig index fb41ddd7c..b4be21fe9 100755 --- a/target/linux/brcm47xx/base-files/etc/init.d/netconfig +++ b/target/linux/brcm47xx/base-files/etc/init.d/netconfig @@ -81,46 +81,67 @@ start() { BEGIN { FS="=" - c["lan_ifname"]="eth0.0" - c["wan_ifname"]="eth0.1" - c["vlan0ports"]="1 2 3 4 5" - c["vlan1ports"]="0 5" + c["lan_ifname"]="eth0.1" + c["wan_ifname"]="eth0.2" + c["vlan1ports"]="1 2 3 4 5t" + c["vlan2ports"]="0 5t" getline < "/proc/diag/model" model=$0 for (i = 0; i < 6; i++) { if (mac_check != "") mac_check = mac_check ":" mac_check = mac_check "[0-9a-fA-F][0-9a-fA-F]" } + if (system("[ -d /proc/switch/eth0 ] ") == 0) { + getline cpuport < "/proc/switch/eth0/cpuport" + } + if (system("command -v swconfig > /dev/null") == 0) { + "swconfig dev switch0 help \| sed -ne \"s\|.*cpu @ \\([0-9]*\\).*\|\\1\|p\"" | getline cpuport + } + if (cpuport == "8") { + c["vlan1ports"]="1 2 3 4 8t" + c["vlan2ports"]="0 8t" + } } - ($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") || ($1 ~ /macaddr/) { + ($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") || ($1 ~ /macaddr/) || \ + ($1 ~ /^vlan[0-9]{1,2}ports$/) { nvram[$1] = $2 } END { + if (((nvram["vlan0ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan1ports"] ~ /^4 8/ && (cpuport == "8"))) || \ + ((nvram["vlan1ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan2ports"] ~ /^4 8/ && (cpuport == "8")))) { + c["vlan1ports"] = "0 1 2 3 8t" + c["vlan2ports"] = "4 8t" + } + if (((nvram["vlan0ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan1ports"] ~ /^4 5/ && (cpuport == "5"))) || \ + ((nvram["vlan1ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan2ports"] ~ /^4 5/ && (cpuport == "5")))) { + c["vlan1ports"] = "0 1 2 3 5t" + c["vlan2ports"] = "4 5t" + } if ((model == "ASUS WL-HDD") || (model == "ASUS WL-300g") || (model == "Linksys WAP54G V1")) { c["wan_ifname"] = "" c["lan_ifname"] = "eth1" } if (model == "ASUS WL-330gE") { c["wan_ifname"] = "" - c["lan_ifname"] = "eth0.0" - c["vlan0ports"] = "4 5" - c["vlan1ports"] = "" + c["lan_ifname"] = "eth0.1" + c["vlan1ports"] = "4 5t" + c["vlan2ports"] = "" } if ((model == "ASUS WL-500g") || (model == "Microsoft MN-700")) { c["wan_ifname"] = "eth1" c["lan_ifname"] = "eth0" } if ((model == "ASUS WL-500g Premium V2") || (model == "Dell TrueMobile 2300 v2") || (model == "Buffalo WHR-G125")) { - c["vlan0ports"] = "0 1 2 3 5" - c["vlan1ports"] = "4 5" + c["vlan1ports"] = "0 1 2 3 5t" + c["vlan2ports"] = "4 5t" } if (model == "Dell TrueMobile 2300") { c["lan_ifname"] = "eth0" c["wan_ifname"] = "eth1" - c["vlan0ports"] = "0 1 2 3 4 5u" - c["vlan1ports"] = "" + c["vlan1ports"] = "0 1 2 3 4 5u" + c["vlan2ports"] = "" } if (nvram["boardtype"] == "bcm94710r4") { # Toshiba WRC-1000 @@ -128,18 +149,18 @@ start() { c["wan_ifname"] = "eth1" } if ((nvram["boardtype"] == "wgt634u") || (nvram["boardtype"] == "0x0467")) { - c["vlan0ports"] = "0 1 2 3 5" - c["vlan1ports"] = "4 5" + c["vlan1ports"] = "0 1 2 3 5t" + c["vlan2ports"] = "4 5t" } if ((nvram["boardtype"] == "0x042f") || (nvram["boardtype"] == "0x0472")) { if (nvram["boardnum"] == "45") { # WL-500gP - c["vlan0ports"] = "1 2 3 4 5" - c["vlan1ports"] = "0 5" + c["vlan1ports"] = "1 2 3 4 5t" + c["vlan2ports"] = "0 5t" } else { # Generic BCM94704 - c["vlan0ports"] = "0 1 2 3 4 5u" - c["vlan1ports"] = "" + c["vlan1ports"] = "0 1 2 3 4 5u" + c["vlan2ports"] = "" c["lan_ifname"] = "eth0" c["wan_ifname"] = "eth1" @@ -152,18 +173,11 @@ start() { } # Buffalo WBR-B11 and Buffalo WBR-G54 if (nvram["boardtype"] == "bcm94710ap") { - c["vlan0ports"] = "0 1 2 3 4 5u" - c["vlan1ports"] = "" + c["vlan1ports"] = "0 1 2 3 4 5u" + c["vlan2ports"] = "" c["lan_ifname"] = "eth0" c["wan_ifname"] = "eth1" } - # generic broadcom 4705/4785 processor with 5397 switch? - # EXCEPT Linksys WRT300N V1.1 - if ((nvram["boardtype"] == "0x478") && \ - (model != "Linksys WRT300N V1.1")) { - c["vlan0ports"] = "1 2 3 4 8*" - c["vlan1ports"] = "0 8" - } # WAP54G if ((nvram["boardnum"] == "2") || \ @@ -184,35 +198,41 @@ start() { # Generic BCM94704 settings instead so we revert to proper settings here. # Hopefully someone will fix this properly soon. if (model == "ASUS WL-700gE") { - c["lan_ifname"]="eth0.0" - c["wan_ifname"]="eth0.1" - c["vlan0ports"]="1 2 3 4 5" - c["vlan1ports"]="0 5" + c["lan_ifname"]="eth0.1" + c["wan_ifname"]="eth0.2" + c["vlan1ports"]="1 2 3 4 5t" + c["vlan2ports"]="0 5t" } if ((model == "Motorola WR850G V2/V3") || (model == "Siemens SE505 V2")) { - c["vlan0ports"]="0 1 2 3 5" - c["vlan1ports"]="4 5" + c["vlan1ports"]="0 1 2 3 5t" + c["vlan2ports"]="4 5t" } if (model == "ASUS WL-500W") { c["lan_ifname"] = "eth0" c["wan_ifname"] = "eth1" - c["vlan0ports"] = "0 1 2 3 4 5u" - c["vlan1ports"] = "" + c["vlan1ports"] = "0 1 2 3 4 5u" + c["vlan2ports"] = "" } if (model == "OvisLink WL-1600GL") { - c["lan_ifname"] = "eth0.0" - c["wan_ifname"] = "eth0.1" - c["vlan0ports"] = "0 1 2 3 5" - c["vlan1ports"] = "4 5" + c["lan_ifname"] = "eth0.1" + c["wan_ifname"] = "eth0.2" + c["vlan1ports"] = "0 1 2 3 5t" + c["vlan2ports"] = "4 5t" + } + if (model == "SimpleTech SimpleShare NAS") { + c["lan_ifname"] = "eth0" + c["wan_ifname"] = "" + c["vlan1ports"] = "" + c["vlan2ports"] = "" } - if (c["vlan0ports"] || c["vlan1ports"]) { + if (c["vlan1ports"] || c["vlan2ports"]) { print "#### VLAN configuration " print "config switch eth0" print " option enable 1" print "" - vlan(0, "vlan0ports") vlan(1, "vlan1ports") + vlan(2, "vlan2ports") } print "#### Loopback configuration" print "config interface loopback" |