From: Rafał Miłecki <zajec5@gmail.com>
Date: Sun, 12 Apr 2015 20:11:25 +0000 (+0000)
Subject: bcm53xx: try to handle Netgear R8000 VLANs config
X-Git-Tag: v15.05~702
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=3121f1f9dc19a498c7f0f8a1c33e0c5f22552b0b;p=openwrt-github%2F.git

bcm53xx: try to handle Netgear R8000 VLANs config

It seems to have few ports connected to CPU (only for CPU sending data?)
as part of "SMP dual core 3 GMAC setup" feature.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45403 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 5886bd2d98..9ffb427d1c 100644
--- a/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
@@ -20,7 +20,14 @@ 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