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
commitd9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76 (patch)
tree902ba8bee0eeb73fdb63e9402112c8c0ff4fb12f /target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
parent226d8cb16579aecaaf52228177a795e276bf8f06 (diff)
downloadupstream-d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76.tar.gz
upstream-d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76.tar.bz2
upstream-d9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76.zip
[kernel] refresh 2.6.26 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13135 3c298f89-4303-0410-b956-a3cf2f4a3e73
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