[kernel] 2.6.{28,30}: refresh patches

[openwrt.git] / target / linux / atheros / base-files / etc / preinit.arch

diff --git a/target/linux/atheros/base-files/etc/preinit.arch b/target/linux/atheros/base-files/etc/preinit.arch
index d02e407..9bda9cc 100755 (executable)
--- a/target/linux/atheros/base-files/etc/preinit.arch
+++ b/target/linux/atheros/base-files/etc/preinit.arch
@@ -1,10 +1,11 @@
 # reset button only supported on ar5315+ at the moment
 grep 'Atheros AR231[567]' /proc/cpuinfo > /dev/null && {
 # reset button only supported on ar5315+ at the moment
 grep 'Atheros AR231[567]' /proc/cpuinfo > /dev/null && {

-       if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" ]; then
+       if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
+            -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then

                vconfig set_name_type DEV_PLUS_VID_NO_PAD
                ifconfig eth0 up
                vconfig set_name_type DEV_PLUS_VID_NO_PAD
                ifconfig eth0 up

-               vconfig add eth0 0
-               ifname=eth0.0
+               vconfig add eth0 1
+               ifname=eth0.1

        else
                ifname=eth0
        fi
        else
                ifname=eth0
        fi


@@ -12,8 +13,9 @@ grep 'Atheros AR231[567]' /proc/cpuinfo > /dev/null && {
        netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
        ifconfig "$ifname" 0.0.0.0 down
        sleep 2
        netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
        ifconfig "$ifname" 0.0.0.0 down
        sleep 2

-       if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" ]; then
-               vconfig rem eth0.0
+       if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
+            -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
+               vconfig rem eth0.1

                ifconfig eth0 down
        fi
 }
                ifconfig eth0 down
        fi
 }