aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-12-20 15:09:01 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-12-20 15:09:01 +0000
commite7d7f591719e8cbbaf74f6662b55e407fd9d32b0 (patch)
tree2293b52cadbe07753fe1688e6f1b8a4a4a60c0f6 /target
parent08472471296caaa772f81a1ad09b40659a8e41fc (diff)
downloadupstream-e7d7f591719e8cbbaf74f6662b55e407fd9d32b0.tar.gz
upstream-e7d7f591719e8cbbaf74f6662b55e407fd9d32b0.tar.bz2
upstream-e7d7f591719e8cbbaf74f6662b55e407fd9d32b0.zip
bcm53xx: support WAN connected to switch port 0
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43754
Diffstat (limited to 'target')
-rw-r--r--target/linux/bcm53xx/base-files/etc/uci-defaults/02_network13
1 files changed, 11 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network b/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
index 7517d071bb..5886bd2d98 100644
--- a/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
@@ -13,8 +13,17 @@ ucidef_set_interface_loopback
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1"
-ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
-ucidef_add_switch_vlan "switch0" "2" "4 5t"
+
+vlan1ports="$(nvram get vlan1ports)"
+vlan2ports="$(nvram get vlan2ports)"
+if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \
+ echo "$vlan2ports" | egrep -q "^0 5"; then
+ ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
+ ucidef_add_switch_vlan "switch0" "2" "0 5t"
+else
+ ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
+ ucidef_add_switch_vlan "switch0" "2" "4 5t"
+fi
uci commit network