From 8344da813ed47be2895f58ac1baebf67555cd488 Mon Sep 17 00:00:00 2001 From: hauke Date: Mon, 11 Nov 2013 23:04:47 +0000 Subject: [PATCH] brcm47xx: fix netconfig for inverted vlan?ports in nvram This was observed on the Belkin Share F7D7302. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38769 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm47xx/base-files/etc/init.d/netconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm47xx/base-files/etc/init.d/netconfig b/target/linux/brcm47xx/base-files/etc/init.d/netconfig index 1bf948727b..d0ce9d3d48 100755 --- a/target/linux/brcm47xx/base-files/etc/init.d/netconfig +++ b/target/linux/brcm47xx/base-files/etc/init.d/netconfig @@ -93,12 +93,14 @@ start() { 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")))) { + ((nvram["vlan1ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan2ports"] ~ /^4 8/ && (cpuport == "8"))) || \ + ((nvram["vlan2ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan1ports"] ~ /^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")))) { + ((nvram["vlan1ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan2ports"] ~ /^4 5/ && (cpuport == "5"))) || \ + ((nvram["vlan2ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan1ports"] ~ /^4 5/ && (cpuport == "5")))) { c["vlan1ports"] = "0 1 2 3 5t" c["vlan2ports"] = "4 5t" } -- 2.30.2