diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-07-14 13:19:58 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-07-14 13:19:58 +0000 |
commit | 3bc90a4d23e05be4a54edfccae3d45eefcfa5557 (patch) | |
tree | ab387b07ef6b90afeeb88a2487eb1b5960c406ec /target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm | |
parent | 17bbc928823c15ed47b6302c916fba23c90e6499 (diff) | |
download | master-31e0f0ae-3bc90a4d23e05be4a54edfccae3d45eefcfa5557.tar.gz master-31e0f0ae-3bc90a4d23e05be4a54edfccae3d45eefcfa5557.tar.bz2 master-31e0f0ae-3bc90a4d23e05be4a54edfccae3d45eefcfa5557.zip |
brcm47xx: fix switch handling
This fixes some problems with the switch handling
* It now send the messages again to indicate a button for failsafe mode should be pressed
* it does not leak packages between wan and lan any more
* the switch works again in normal mode
The Ethernet connection has to be up when the switch driver switch-robo
is insmoded therefor we just do it again.
Explicitly set enable_vlan to prevent leaking packages.
This should close #13869, #13868 and #13716
SVN-Revision: 37286
Diffstat (limited to 'target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm')
-rw-r--r-- | target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm | 41 |
1 files changed, 19 insertions, 22 deletions
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 8c425a094e..bc749398f5 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 @@ -1,37 +1,34 @@ #!/bin/sh -port_net_echo() { - [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { - if [ "$pi_preinit_net_messages" = "y" ] || [ "$pi_failsafe_net_message" = "true" ] && [ "$pi_preinit_no_failsafe_netmsg" != "y" ]; then - netmsg $pi_broadcast "$1" - fi - } -} - -preinit_ip_deconfig() { - if [ -z "$pi_ifname" ]; then - ifconfig $ifname 0.0.0.0 down - else - grep -q "$pi_ifname" /proc/net/dev && { - ifconfig $pi_ifname 0.0.0.0 down - } - fi -} - -preinit_net_echo() { +preinit_net_echo_send() { preinit_ip [ -d /proc/switch/eth0 ] && [ "$pi_ifname" = "eth0" ] && { + echo 1 > /proc/switch/eth0/reset + echo 1 > /proc/switch/eth0/enable + echo 1 > /proc/switch/eth0/enable_vlan # 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/1/ports - port_net_echo $1 + sleep 1 + + netmsg $pi_broadcast "$1" }; done - echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/1/ports + } || netmsg $pi_broadcast "$1" +} - } || port_net_echo $1 +preinit_net_echo() { + [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { + { + [ "$pi_preinit_net_messages" = "y" ] || { + [ "$pi_failsafe_net_message" = "true" ] && + [ "$pi_preinit_no_failsafe_netmsg" != "y" ] + } + } && preinit_net_echo_send $1 + } } |