crans/openwrt-chaoscalmer-uappro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kirkwood: drop port-based VLAN setup

Browse source 
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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44122 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
luka 2015-01-25 13:11:02 +00:00
parent 0c28ecf9df
commit c3bddaa519
1 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
target/linux/kirkwood/base-files/etc/uci-defaults/02_network
View file

@ -20,19 +20,6 @@ set network.lan6.reqprefix='no'
EOF 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/functions/uci-defaults.sh
. /lib/kirkwood.sh . /lib/kirkwood.sh
@ -55,15 +42,15 @@ case "$board" in
;; ;;
"ea3500") "ea3500")
ucidef_set_interfaces_lan_wan "eth0" "eth1" ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" "1" "0" ucidef_add_switch "switch0" "1" "1"
add_port_based_vlan "switch0" "1" "0 1 2 3 5" ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
add_port_based_vlan "switch0" "2" "4 6" ucidef_add_switch_vlan "switch0" "2" "4 6"
;; ;;
"ea4500") "ea4500")
ucidef_set_interfaces_lan_wan "eth0" "eth1" ucidef_set_interfaces_lan_wan "eth0" "eth1"
ucidef_add_switch "switch0" "1" "0" ucidef_add_switch "switch0" "1" "1"
add_port_based_vlan "switch0" "1" "0 1 2 3 5" ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
add_port_based_vlan "switch0" "2" "4 6" ucidef_add_switch_vlan "switch0" "2" "4 6"
;; ;;
"guruplug-server-plus") "guruplug-server-plus")
set_lan_dhcp "eth0" "eth1" set_lan_dhcp "eth0" "eth1"