diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:32:35 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:32:35 +0000 |
| commit | 9285574b20298c1499aedee162f5659e1e356862 (patch) | |
| tree | d5f50bfbd765bba8d95d15fa170f7d487a7d1d49 /target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch | |
| parent | f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (diff) | |
| download | master-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.tar.gz master-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.tar.bz2 master-31e0f0ae-9285574b20298c1499aedee162f5659e1e356862.zip | |
refresh ixp4xx patches to match upstream style
SVN-Revision: 11297
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch index b53bf5f79c..699763f518 100644 --- a/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch +++ b/target/linux/ixp4xx/patches-2.6.25/203-npe_driver_phy_reset_autoneg.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c -+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c -@@ -322,8 +322,12 @@ static void phy_reset(struct net_device +--- a/drivers/net/arm/ixp4xx_eth.c ++++ b/drivers/net/arm/ixp4xx_eth.c +@@ -322,8 +322,12 @@ struct port *port = netdev_priv(dev); int phy_id = port->mii[idx].phy_id; int cycles = 0; @@ -16,7 +14,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c while (cycles < MAX_MII_RESET_RETRIES) { if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) { -@@ -331,13 +335,23 @@ static void phy_reset(struct net_device +@@ -331,13 +335,23 @@ printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n", dev->name, cycles); #endif |