From: Rafał Miłecki Date: Sat, 20 Dec 2014 15:09:01 +0000 (+0000) Subject: bcm53xx: support WAN connected to switch port 0 X-Git-Tag: v15.05~2267 X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=f7e3ab8f270f0a6b6238f5b778c4ef9896f1a2ae;p=openwrt-github%2F.git bcm53xx: support WAN connected to switch port 0 Signed-off-by: Rafał Miłecki git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43754 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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