Index: target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig =================================================================== --- target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig (revision 9013) +++ target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig (working copy) @@ -47,11 +47,11 @@ mac_check = mac_check "[0-9a-fA-F][0-9a-fA-F]" } } - + ($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") || ($1 ~ /macaddr/) { nvram[$1] = $2 } - + END { if ((model == "ASUS WL-HDD") || (model == "ASUS WL-300g") || (model == "Linksys WAP54G V1")) { c["wan_ifname"] = "" @@ -61,6 +61,10 @@ c["wan_ifname"] = "eth1" c["lan_ifname"] = "eth0" } + if (model == "Dell TrueMobile 2300") { + c["vlan0ports"] = "0 1 2 3 5*" + c["vlan1ports"] = "4 5" + } if (nvram["boardtype"] == "bcm94710r4") { # Toshiba WRC-1000 c["lan_ifname"] = "eth0" @@ -74,23 +78,19 @@ c["vlan0ports"] = "0 1 2 3 5*" c["vlan1ports"] = "4 5" } - if ((nvram["boardtype"] == "0x042f") || (nvram["boardtype"] == "0x0472")) { - if (nvram["boardnum"] == "45") { - # WL-500gP - c["vlan0ports"] = "1 2 3 4 5*" - c["vlan1ports"] = "0 5" - } else { - # Generic BCM94704 - c["vlan0ports"] = "0 1 2 3 4 5u" - c["vlan1ports"] = "" - c["lan_ifname"] = "eth0" - c["wan_ifname"] = "eth1" + if (((nvram["boardtype"] == "0x042f") || (nvram["boardtype"] == "0x0472")) \ + && (model != "ASUS WL-500gP") \ + && (model != "ASUS WL-700gE")) { + # Generic BCM94704 + c["vlan0ports"] = "0 1 2 3 4 5u" + c["vlan1ports"] = "" + c["lan_ifname"] = "eth0" + c["wan_ifname"] = "eth1" - # MAC addresses on 4704 tend to be screwed up. Add a workaround here - if (nvram["et0macaddr"] ~ mac_check) { - c["lan_macaddr"] = nvram["et0macaddr"] - c["wan_macaddr"] = macinc(c["lan_macaddr"]) - } + # MAC addresses on 4704 tend to be screwed up. Add a workaround here + if (nvram["et0macaddr"] ~ mac_check) { + c["lan_macaddr"] = nvram["et0macaddr"] + c["wan_macaddr"] = macinc(c["lan_macaddr"]) } } @@ -100,23 +100,12 @@ c["lan_ifname"]="eth0" c["wan_ifname"]="" } - - # ASUS WL-700gE - # These are actually same as defaults above. For some reason this script applies - # 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" - } if (model == "Motorola WR850G V2/V3") { c["vlan0ports"]="0 1 2 3 5*" c["vlan1ports"]="4 5" } - + print "#### VLAN configuration " print "config switch eth0" p("vlan0", "vlan0ports")