From ee086ad6e87be659d1f19079af7a0256df5e0dc4 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 2 Dec 2015 18:51:12 +0000 Subject: [PATCH] bcm53xx: switch to ucidef_add_switch_ports() Signed-off-by: Jo-Philipp Wich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47692 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/bcm53xx/base-files/etc/board.d/02_network | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network index a164251c6a..338e71134c 100755 --- a/target/linux/bcm53xx/base-files/etc/board.d/02_network +++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network @@ -34,8 +34,8 @@ ucidef_add_switch "switch0" "1" "1" # Workaround for devices using CPU port 8 (connected to eth2) case "$board" in netgear,r8000) - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t" - ucidef_add_switch_vlan "switch0" "2" "4 5t" + ucidef_add_switch_ports "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname" board_config_flush exit 0 ;; @@ -50,19 +50,19 @@ vlan1ports="$(echo $(nvram get vlan1ports | tr " " "\n" | sort))" vlan2ports="$(echo $(nvram get vlan2ports | tr " " "\n" | sort))" 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" + ucidef_add_switch_ports "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5t@$ifname" elif echo "$vlan1ports" | egrep -q "^1 2 3 5 7" && \ echo "$vlan2ports" | egrep -q "^0 7"; then - ucidef_add_switch_vlan "switch0" "1" "1 2 3 5 7t" - ucidef_add_switch_vlan "switch0" "2" "0 7t" + ucidef_add_switch_ports "switch0" \ + "1:lan" "2:lan" "3:lan" "5:lan" "0:wan" "7t@$ifname" 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" + ucidef_add_switch_ports "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "5:lan" "7:lan" "4:wan" "8t@$ifname" else - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t" - ucidef_add_switch_vlan "switch0" "2" "4 5t" + ucidef_add_switch_ports "switch0" \ + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname" fi board_config_flush -- 2.11.0