rpms/kernel/F-11 net-revert-forcedeth-power-down-phy-when-interface-is.patch, NONE, 1.1 kernel.spec, 1.1598, 1.1599

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16337

Modified Files:
	kernel.spec 
Added Files:
	net-revert-forcedeth-power-down-phy-when-interface-is.patch 
Log Message:
* Mon May 11 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-137
- net-revert-forcedeth-power-down-phy-when-interface-is.patch:
   Attempt to fix forcedeth failures, (#484505)


net-revert-forcedeth-power-down-phy-when-interface-is.patch:

--- NEW FILE net-revert-forcedeth-power-down-phy-when-interface-is.patch ---
>From c1043da4aa23c180e36399f7c32cb909f7924c31 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
Date: Mon, 11 May 2009 12:49:30 -0400
Subject: [PATCH] Revert "forcedeth: power down phy when interface is down"

This reverts commit cb52deba12f27af90a46d2f8667a64888118a888.
---
 drivers/net/forcedeth.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index df0794e..3798f67 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -1446,9 +1446,9 @@ static int phy_init(struct net_device *dev)
 	/* some phys clear out pause advertisment on reset, set it back */
 	mii_rw(dev, np->phyaddr, MII_ADVERTISE, reg);
 
-	/* restart auto negotiation, power down phy */
+	/* restart auto negotiation */
 	mii_control = mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ);
-	mii_control |= (BMCR_ANRESTART | BMCR_ANENABLE | BMCR_PDOWN);
+	mii_control |= (BMCR_ANRESTART | BMCR_ANENABLE);
 	if (mii_rw(dev, np->phyaddr, MII_BMCR, mii_control)) {
 		return PHY_ERROR;
 	}
@@ -5210,10 +5210,6 @@ static int nv_open(struct net_device *dev)
 
 	dprintk(KERN_DEBUG "nv_open: begin\n");
 
-	/* power up phy */
-	mii_rw(dev, np->phyaddr, MII_BMCR,
-	       mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ) & ~BMCR_PDOWN);
-
 	/* erase previous misconfiguration */
 	if (np->driver_data & DEV_HAS_POWER_CNTRL)
 		nv_mac_reset(dev);
@@ -5407,10 +5403,6 @@ static int nv_close(struct net_device *dev)
 	if (np->wolenabled) {
 		writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
 		nv_start_rx(dev);
-	} else {
-		/* power down phy */
-		mii_rw(dev, np->phyaddr, MII_BMCR,
-		       mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ)|BMCR_PDOWN);
 	}
 
 	/* FIXME: power down nic */
-- 
1.6.2.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1598
retrieving revision 1.1599
diff -u -p -r1.1598 -r1.1599
--- kernel.spec	9 May 2009 22:35:18 -0000	1.1598
+++ kernel.spec	11 May 2009 16:52:27 -0000	1.1599
@@ -663,6 +663,8 @@ Patch610: hda_intel-prealloc-4mb-dmabuff
 Patch611: linux-2.6.29-alsa-update-quirks.patch
 Patch612: alsa-hda-add-debugging.patch
 
+Patch630: net-revert-forcedeth-power-down-phy-when-interface-is.patch
+
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
@@ -1264,6 +1266,7 @@ ApplyPatch hda_intel-prealloc-4mb-dmabuf
 ApplyPatch alsa-hda-add-debugging.patch
 
 # Networking
+ApplyPatch net-revert-forcedeth-power-down-phy-when-interface-is.patch
 
 # Misc fixes
 # The input layer spews crap no-one cares about.
@@ -1971,7 +1974,11 @@ fi
 # and build.
 
 %changelog
-* Sat May 09 2009 Chuck Ebbert <kcebbert at redhat.com> 2.6.29.3-136
+* Mon May 11 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-137
+- net-revert-forcedeth-power-down-phy-when-interface-is.patch:
+   Attempt to fix forcedeth failures, (#484505)
+
+* Sat May 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.3-136
 - Add more verbose debug messages for bug #498401
 
 * Fri May 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.3-135