aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-07-14 14:49:07 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-07-14 14:49:07 +0000
commitf7f395e38563b24c4e09b25a599589df77acd207 (patch)
treefbf2a3456b15d89248459db67546900a4184ac04
parenta5695b2bd6febf8d50720f9c45fbf3b685d1ec84 (diff)
downloadupstream-f7f395e38563b24c4e09b25a599589df77acd207.tar.gz
upstream-f7f395e38563b24c4e09b25a599589df77acd207.tar.bz2
upstream-f7f395e38563b24c4e09b25a599589df77acd207.zip
AA: brcm47xx: prevent the switch from leaking packages between lan and wan.
This is partly a backport of r37286, this closes #13716 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37309 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm1
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm6
2 files changed, 3 insertions, 4 deletions
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 a93559f97b..da752b31b2 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
@@ -2,7 +2,6 @@
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
}
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 a0a3033465..e2260a490a 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
@@ -30,9 +30,9 @@ preinit_net_echo() {
echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
port_net_echo $1
}; done
-
- echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
-
+
+ echo 1 > /proc/switch/eth0/reset
+
} || port_net_echo $1
}