X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1477f1e30e335b9ad2df451636277c714dc37797..35d8522c6a2841fe05f3bf02c4f3c2dbea81d8c7:/target/linux/brcm-2.4/base-files/etc/init.d/netconfig?ds=sidebyside

diff --git a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
index b5d900a73..d20ff43b8 100755
--- a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
+++ b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
@@ -14,11 +14,12 @@ start() {
 					case "$1" in
 					vlan[0-9]|vlan1[0-5])
 						local id="${1#vlan}"
+						local ports="${2%\*}"
 						append batch "delete network.eth0.${1}${N}"
-						append batch "set network.eth0_${n}=switch_vlan${N}"
-						append batch "set network.eth0_${n}.device=eth0${N}"
-						append batch "set network.eth0_${n}.vlan=${id}${N}"
-						append batch "set network.eth0_${n}.ports='${2}'${N}"
+						append batch "set network.eth0_${id}=switch_vlan${N}"
+						append batch "set network.eth0_${id}.device=eth0${N}"
+						append batch "set network.eth0_${id}.vlan=${id}${N}"
+						append batch "set network.eth0_${id}.ports='${ports}'${N}"
 					;;
 					esac
 				}
@@ -82,7 +83,7 @@ start() {
 		FS="="
 		c["lan_ifname"]="eth0.0"
 		c["wan_ifname"]="eth0.1"
-		c["vlan0ports"]="1 2 3 4 5*"
+		c["vlan0ports"]="1 2 3 4 5"
 		c["vlan1ports"]="0 5"
 		getline < "/proc/diag/model"
 		model=$0
@@ -107,12 +108,12 @@ start() {
 			c["vlan0ports"] = ""
 			c["vlan1ports"] = ""
 		}
-		if (model == "ASUS WL-500g") {
+		if ((model == "ASUS WL-500g") || (model == "Microsoft MN-700")) {
 			c["wan_ifname"] = "eth1"
 			c["lan_ifname"] = "eth0"
 		}
 		if (model == "ASUS WL-500g Premium V2") {
-				c["vlan0ports"] = "0 1 2 3 5*"
+				c["vlan0ports"] = "0 1 2 3 5"
 				c["vlan1ports"] = "4 5"
 		}
 		if (model == "Dell TrueMobile 2300") {
@@ -122,7 +123,7 @@ start() {
 			c["vlan1ports"] = ""
 		}
 		if (model == "Dell TrueMobile 2300 v2") {
-			c["vlan0ports"] = "0 1 2 3 5*"
+			c["vlan0ports"] = "0 1 2 3 5"
 			c["vlan1ports"] = "4 5"
 		}
 		if (nvram["boardtype"] == "bcm94710r4") {
@@ -131,17 +132,17 @@ start() {
 			c["wan_ifname"] = "eth1"
 		}
 		if (nvram["boardtype"] == "wgt634u") {
-			c["vlan0ports"] = "0 1 2 3 5*"
+			c["vlan0ports"] = "0 1 2 3 5"
 			c["vlan1ports"] = "4 5"
 		}
 		if (nvram["boardtype"] == "0x0467") {
-			c["vlan0ports"] = "0 1 2 3 5*"
+			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["vlan0ports"] = "1 2 3 4 5"
 				c["vlan1ports"] = "0 5"
 			} else {
 				# Generic BCM94704
@@ -164,8 +165,10 @@ start() {
 			c["lan_ifname"] = "eth0"
 			c["wan_ifname"] = "eth1"
 		}
-		if (nvram["boardtype"] == "0x478") {
-			# generic broadcom 4785 processor with 5397 switch?
+		# 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"
 		}
@@ -191,12 +194,12 @@ start() {
 		if (model == "ASUS WL-700gE") {
 			c["lan_ifname"]="eth0.0"
 			c["wan_ifname"]="eth0.1"
-			c["vlan0ports"]="1 2 3 4 5*"
+			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["vlan0ports"]="0 1 2 3 5"
 			c["vlan1ports"]="4 5"
 		}
 		if (model == "ASUS WL-500W") {
@@ -205,6 +208,12 @@ start() {
 			c["vlan0ports"] = "0 1 2 3 4 5u"
 			c["vlan1ports"] = ""
 		}
+		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"
+		}
 
 		if (c["vlan0ports"] || c["vlan1ports"]) {
 			print "#### VLAN configuration "