From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 16 Feb 2013 12:37:24 +0000 (+0000)
Subject: brcm47xx: try to automatically detect if the wan port is at port 4 and not at port 0.
X-Git-Tag: reboot~11250
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d9580d224a7e19e65a655eb14e0b442d6a7ff03d;p=openwrt%2Fopenwrt.git

brcm47xx: try to automatically detect if the wan port is at port 4 and not at port 0.

This should fix #13000.

SVN-Revision: 35617
---

diff --git a/target/linux/brcm47xx/base-files/etc/init.d/netconfig b/target/linux/brcm47xx/base-files/etc/init.d/netconfig
index 2b1a66d33d..98747f5803 100755
--- a/target/linux/brcm47xx/base-files/etc/init.d/netconfig
+++ b/target/linux/brcm47xx/base-files/etc/init.d/netconfig
@@ -101,11 +101,22 @@ start() {
 		}
 	}
 
-	($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["vlan0ports"] = "0 1 2 3 8"
+			c["vlan1ports"] = "4 8"
+		}
+		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["vlan0ports"] = "0 1 2 3 5"
+			c["vlan1ports"] = "4 5"
+		}
 		if ((model == "ASUS WL-HDD") || (model == "ASUS WL-300g") || (model == "Linksys WAP54G V1")) {
 			c["wan_ifname"] = ""
 			c["lan_ifname"] = "eth1"