From: Luka Perkov <luka@openwrt.org>
Date: Sun, 25 Jan 2015 13:11:02 +0000 (+0000)
Subject: kirkwood: drop port-based VLAN setup
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=86f1a6054977693e96f6b8ffc358cff4f9b911aa;p=openwrt%2Fstaging%2Fynezz.git

kirkwood: drop port-based VLAN setup

Using port-based VLANs depends on a non-standard
swconfig parameter, which compilcates things like
LuCI that don't know about it. This patch changes
the default to use 802.1q VLANs internally in the
switch, but without tagging packets since we have
two Ethernet ports.

iperf3 tests indicate no difference in performance
versus port-based VLANs when the CPU port is not
using tags.

Signed-off-by: Claudio Leite <leitec@staticky.com>

SVN-Revision: 44122
---

diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
index 994d7e8998..540c8c33ce 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
@@ -20,19 +20,6 @@ set network.lan6.reqprefix='no'
 EOF
 }
 
-add_port_based_vlan() {
-	local device=$1
-	local vlan=$2
-	local ports=$3
-	uci batch <<EOF
-add network switch_vlan
-set network.@switch_vlan[-1].device='$device'
-set network.@switch_vlan[-1].vlan='$vlan'
-set network.@switch_vlan[-1].ports='$ports'
-set network.@switch_vlan[-1].port_based='1'
-EOF
-}
-
 . /lib/functions/uci-defaults.sh
 . /lib/kirkwood.sh
 
@@ -55,15 +42,15 @@ case "$board" in
 	;;
 "ea3500")
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
-	ucidef_add_switch "switch0" "1" "0"
-	add_port_based_vlan "switch0" "1" "0 1 2 3 5"
-	add_port_based_vlan "switch0" "2" "4 6"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
+	ucidef_add_switch_vlan "switch0" "2" "4 6"
 	;;
 "ea4500")
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
-	ucidef_add_switch "switch0" "1" "0"
-	add_port_based_vlan "switch0" "1" "0 1 2 3 5"
-	add_port_based_vlan "switch0" "2" "4 6"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
+	ucidef_add_switch_vlan "switch0" "2" "4 6"
 	;;
 "guruplug-server-plus")
 	set_lan_dhcp "eth0" "eth1"