From aee54bad71748addda554739ea0820722c01632b Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 20 Feb 2013 15:31:43 +0000 Subject: brcm47xx: do not use vlan0 any more. The Broadcom switch driver says that vlan0 should not be used with any switch other than bcm5325. This makes OpenWrt always use vlan1 and vlan2 instead. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35704 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm | 2 +- .../brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/brcm47xx/base-files/lib/preinit') diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm index c7d0fc8da8..dd8fd6e9f6 100644 --- a/target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm +++ b/target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm @@ -3,7 +3,7 @@ failsafe_ip() { [ -d /proc/switch/eth0 ] && [ "$ifname" = "eth0" ] && { ifconfig eth0 0.0.0.0 down - echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports + echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/1/ports } [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { diff --git a/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm b/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm index 0a8915080f..8c425a094e 100644 --- a/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm +++ b/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm @@ -27,11 +27,11 @@ preinit_net_echo() { # this would be easier if we blasted the message across all ports # but we don't want packets leaking across interfaces for port in $(seq 0 4); do { - echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports + echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/1/ports port_net_echo $1 }; done - echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports + echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/1/ports } || port_net_echo $1 } -- cgit v1.2.3