[adm5120] resync 2.6.28 config

[openwrt.git] / target / linux / ixp4xx / patches-2.6.26 / 203-npe_driver_phy_reset_autoneg.patch

diff --git a/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
index 699763f..b6519f0 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -322,8 +322,12 @@
+@@ -322,8 +322,12 @@ static void phy_reset(struct net_device 
        struct port *port = netdev_priv(dev);
        int phy_id = port->mii[idx].phy_id;
        int cycles = 0;
@@ -14,7 +14,7 @@
  
        while (cycles < MAX_MII_RESET_RETRIES) {
                if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
-@@ -331,13 +335,23 @@
+@@ -331,13 +335,23 @@ static void phy_reset(struct net_device 
                        printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n",
                               dev->name, cycles);
  #endif