[OpenWrt-Devel,1/3] kirkwood: drop port-based VLAN setup
diff mbox

Message ID 1422062864-30133-1-git-send-email-leitec@staticky.com
State Accepted
Headers show

Commit Message

Claudio Leite Jan. 24, 2015, 1:27 a.m. UTC
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>
---
 .../base-files/etc/uci-defaults/02_network         | 25 ++++++----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

Comments

Luka Perkov Jan. 25, 2015, 1:14 p.m. UTC | #1
Hi Claudio,

On Fri, Jan 23, 2015 at 08:27:42PM -0500, Claudio Leite wrote:
> 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>
> ---
>  .../base-files/etc/uci-defaults/02_network         | 25 ++++++----------------
>  1 file changed, 6 insertions(+), 19 deletions(-)

Applied in r44122. Thank you.

Luka

Patch
diff mbox

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 994d7e8..540c8c3 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"