aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-06 20:55:33 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-06 20:55:33 +0000
commita1bf28950d16ca97897a524dc74ec0e52ef08fff (patch)
treecc582d4bee75a51b8c5a23ff3cef3b18f1739362 /target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
parent2c638cf43bb61b33f581bd057441418a30b39dc4 (diff)
downloadupstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.tar.gz
upstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.tar.bz2
upstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.zip
refresh 2.6.26 patches
SVN-Revision: 13135
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch4
1 files changed, 2 insertions, 2 deletions
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 699763f518..b6519f0343 100644
--- 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