aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-11-25 14:03:51 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-11-25 14:03:51 +0000
commit54d79d1531f8461c4dae16a9dd0138d64f50a895 (patch)
tree91a4addcb20af75cbe53744b9b09ba3872426c7e /target
parentb2336ec05ac89fa562b5ac2e1242dfd65630d5ca (diff)
downloadupstream-54d79d1531f8461c4dae16a9dd0138d64f50a895.tar.gz
upstream-54d79d1531f8461c4dae16a9dd0138d64f50a895.tar.bz2
upstream-54d79d1531f8461c4dae16a9dd0138d64f50a895.zip
brcm47xx: whitespace cleanups
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34329 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm2
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm2
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm1
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/05_set_failsafe_switch_brcm5
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm1
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm10
-rw-r--r--target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm2
7 files changed, 7 insertions, 16 deletions
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm b/target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm
index b0f4a4efa9..a930b7eb4a 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/03_init_hotplug_failsafe_brcm
@@ -5,5 +5,3 @@ init_hotplug_failsafe() {
}
boot_hook_add preinit_main init_hotplug_failsafe
-
-
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
index 3cd760e2db..038a415a62 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
@@ -28,7 +28,7 @@ check_module () {
init_iface() {
check_module tg3
insmod switch-core
- check_module switch-robo || check_module switch-adm || {
+ check_module switch-robo || check_module switch-adm || {
check_module bcm57xx activate_gpio=0x4 && cpu_port="8u*"
} || rmmod switch-core
}
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm
index 5a5ffe96c0..5aa7bc0b1d 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/05_reset_button_brcm
@@ -5,4 +5,3 @@ enable_reset_button() {
}
boot_hook_add preinit_main enable_reset_button
-
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..c7d0fc8da8 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
@@ -5,11 +5,10 @@ failsafe_ip() {
ifconfig eth0 0.0.0.0 down
echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/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
+ ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
}
}
boot_hook_add failsafe failsafe_ip
-
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm b/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm
index fd5add16a5..923c98fd49 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/15_mount_proc_brcm
@@ -3,4 +3,3 @@
do_mount_procfs() {
mount none /proc -t proc
}
-
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..0a8915080f 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
@@ -2,7 +2,7 @@
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
+ if [ "$pi_preinit_net_messages" = "y" ] || [ "$pi_failsafe_net_message" = "true" ] && [ "$pi_preinit_no_failsafe_netmsg" != "y" ]; then
netmsg $pi_broadcast "$1"
fi
}
@@ -20,7 +20,7 @@ preinit_ip_deconfig() {
preinit_net_echo() {
preinit_ip
-
+
[ -d /proc/switch/eth0 ] && [ "$pi_ifname" = "eth0" ] && {
echo 1 > /proc/switch/eth0/reset
@@ -30,10 +30,8 @@ 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
-
+
} || port_net_echo $1
}
-
-
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm b/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm
index f030cb2837..2b0d2cccc4 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_net_echo_brcm
@@ -8,5 +8,3 @@ indicate_failsafe() {
preinit_net_echo "Entering Failsafe!\n"
indicate_failsafe_led
}
-
-