From fac31ee898573026bd36e164c6f67a9014823a92 Mon Sep 17 00:00:00 2001 From: jogo Date: Wed, 23 Jan 2013 10:12:40 +0000 Subject: bcm63xx: switch to b53 and swconfig Switch to using the B53 switch driver where appropriate. Use a non-tagged default config where it isn't confirmed to be working. Remove the switch configuration in preinit as the switch will now be configured by the driver to use port isolation to prevent leakage between lan and wan. While at it, also provide a switch config for Neufbox 6. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35307 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../lib/preinit/05_failsafe_config_switch_brcm63xx | 5 ----- .../lib/preinit/15_set_preinit_interface_brcm63xx | 19 +------------------ 2 files changed, 1 insertion(+), 23 deletions(-) (limited to 'target/linux/brcm63xx/base-files/lib/preinit') diff --git a/target/linux/brcm63xx/base-files/lib/preinit/05_failsafe_config_switch_brcm63xx b/target/linux/brcm63xx/base-files/lib/preinit/05_failsafe_config_switch_brcm63xx index 43da8cc06..e1653e393 100644 --- a/target/linux/brcm63xx/base-files/lib/preinit/05_failsafe_config_switch_brcm63xx +++ b/target/linux/brcm63xx/base-files/lib/preinit/05_failsafe_config_switch_brcm63xx @@ -1,11 +1,6 @@ #!/bin/sh failsafe_ip() { - [ -d "/proc/switch/$ifname" ] && { - ifconfig "$ifname" 0.0.0.0 down - echo "0 1 2 3 4 ${cpu_port:-5u*}" > "/proc/switch/$ifname/vlan/0/ports" - } - [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up } diff --git a/target/linux/brcm63xx/base-files/lib/preinit/15_set_preinit_interface_brcm63xx b/target/linux/brcm63xx/base-files/lib/preinit/15_set_preinit_interface_brcm63xx index 9d366fa33..7655fb7d5 100644 --- a/target/linux/brcm63xx/base-files/lib/preinit/15_set_preinit_interface_brcm63xx +++ b/target/linux/brcm63xx/base-files/lib/preinit/15_set_preinit_interface_brcm63xx @@ -16,29 +16,12 @@ preinit_ip_deconfig() { ifconfig $pi_ifname 0.0.0.0 down } fi - [ -d "/proc/switch/$ifname" ] && { - echo 1 > "/proc/switch/$ifname/reset" - echo "0 1 2 3 4 ${cpu_port:-5u*}" > "/proc/switch/$ifname/vlan/0/ports" - } - } preinit_net_echo() { preinit_ip - - [ -d "/proc/switch/$ifname" ] && { - echo 1 > "/proc/switch/$ifname/reset" - # 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/$ifname/vlan/0/ports" - port_net_echo $1 - }; done - - echo "0 ${cpu_port:-5u*}" > "/proc/switch/$ifname/vlan/0/ports" - - } || port_net_echo $1 + port_net_echo $1 } -- cgit v1.2.3 From 84d1ef596010756fe8509ef1fa27b8e9be111443 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 5 Feb 2013 22:25:19 +0000 Subject: [brcm63xx] remove references to the old switch driver Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35503 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../base-files/lib/preinit/05_init_interfaces_brcm63xx | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'target/linux/brcm63xx/base-files/lib/preinit') diff --git a/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx b/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx index b7cbecd4f..0f85f4b95 100644 --- a/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx +++ b/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx @@ -8,19 +8,4 @@ set_preinit_iface() { ifconfig $ifname 0.0.0.0 up } -check_module () { - module="$1"; shift; params="$*" - - insmod "$module" "$params" - sleep 1 - grep "^$module" /proc/modules - return $? -} - -init_iface() { - insmod switch-core - check_module switch-robo || check_module switch-adm || rmmod switch-core -} - boot_hook_add preinit_main set_preinit_iface -boot_hook_add preinit_main init_iface -- cgit v1.2.3 From ad40dc736c20e57ebb8a11d0a89910db5574ec5c Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 5 Feb 2013 22:25:30 +0000 Subject: [brcm63xx] remove superfluous calls to /lib/brcm63xx.sh The first preinit script 03_do_brcm63xx.sh does the right job of exporting variables for the other subsequent preinit scripts to use them. Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35504 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx | 4 ---- target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx | 2 -- 2 files changed, 6 deletions(-) (limited to 'target/linux/brcm63xx/base-files/lib/preinit') diff --git a/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx b/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx index 0f85f4b95..1de59b79c 100644 --- a/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx +++ b/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx @@ -1,10 +1,6 @@ #!/bin/sh set_preinit_iface() { - ifname=eth1 - - . /lib/brcm63xx.sh - ifconfig $ifname 0.0.0.0 up } diff --git a/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx b/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx index f6bfbdec3..0dfca73c2 100644 --- a/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx +++ b/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx @@ -1,7 +1,5 @@ #!/bin/sh -. /lib/brcm63xx.sh - enable_reset_button() { if [ "$brcm63xx_has_reset_button" = "true" ]; then insmod input-core -- cgit v1.2.3