summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-10-15 19:30:21 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-10-15 19:30:21 +0000
commit19b0e56ba7d5a1c93075cac3d662486917a9ef35 (patch)
tree030ca3ec5a74f7bf1a96580ad73d6e22956198b1 /target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch
parent3b90e01db8852a89a0925e0b44faec6119d6c5c9 (diff)
downloadmaster-31e0f0ae-19b0e56ba7d5a1c93075cac3d662486917a9ef35.tar.gz
master-31e0f0ae-19b0e56ba7d5a1c93075cac3d662486917a9ef35.tar.bz2
master-31e0f0ae-19b0e56ba7d5a1c93075cac3d662486917a9ef35.zip
refresh patches against 2.6.27 final
SVN-Revision: 12987
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch
index 699763f518..b6519f0343 100644
--- a/target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch
+++ b/target/linux/ixp4xx/patches-2.6.27/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