bcm53xx: try to handle Netgear R8000 VLANs config

[openwrt/svn-archive/archive.git] / target / linux / bcm53xx / base-files / etc / uci-defaults / 02_network

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 7517d071bb7b0571e9e7154c5deb79d8d46c00b5..9ffb427d1c4aec3ff976cbcbeff9a53135166735 100644 (file)
--- 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,24 @@ 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"
+elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \
+     echo "$vlan2ports" | egrep -q "^4 8"; then
+       ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5 7 8t"
+       ucidef_add_switch_vlan "switch0" "2" "4 8t"
+else
+       # This also handles some funcy (e.g. R6250) configs like:
+       # vlan1ports=3 2 1 0 5*
+       # vlan2ports=4 5u
+       ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
+       ucidef_add_switch_vlan "switch0" "2" "4 5t"
+fi
 
 uci commit network