Changeset 17472


Ignore:
Timestamp:
2009-09-02T17:18:26+02:00 (8 years ago)
Author:
nbd
Message:

merge r17469-17471 to 8.09 - fixes failsafe mode on fonera+ and fonera 2.0

Location:
branches/8.09
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/package/base-files/files/etc/preinit

    r15745 r17472  
    6666trap 'FAILSAFE=true' INT 
    6767trap 'FAILSAFE=true' USR1 
    68 [ -e /etc/preinit.arch ] && . /etc/preinit.arch 
     68if [ -e /etc/preinit.arch ]; then 
     69        . /etc/preinit.arch 
     70else 
     71        sleep 2 
     72fi 
    6973set_state preinit 
    7074echo "$HOTPLUG" > /proc/sys/kernel/hotplug 
  • branches/8.09/target/linux/atheros/base-files/etc/preinit.arch

    r10877 r17472  
    1414        ifconfig "$ifname" 0.0.0.0 down 
    1515        sleep 2 
    16         if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ 
    17              -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:1f" ]; then 
     16        if [ -z "$FAILSAFE" -a \ 
     17             \( -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ 
     18                -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:1f" \) ]; then 
    1819                vconfig rem eth0.0 
    1920                ifconfig eth0 down 
  • branches/8.09/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/mvswitch.c

    r11896 r17472  
    247247        dev->phy_ptr = priv; 
    248248        dev->irq = PHY_POLL; 
     249#ifdef HEADER_MODE 
     250        dev->flags |= IFF_PROMISC; 
     251#endif 
    249252 
    250253        /* initialize default vlans */ 
Note: See TracChangeset for help on using the changeset viewer.