rpms/kernel/F-10 kernel.spec, 1.1365, 1.1366 net-revert-forcedeth-power-down-phy-when-interface-is.patch, 1.1, 1.2

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
	net-revert-forcedeth-power-down-phy-when-interface-is.patch 
Log Message:
Copy net-revert-forcedeth-power-down-phy-when-interface-is.patch
  from F-11. This reverts only the power-down part of the original
  upstream patch. (F11#501249)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1365
retrieving revision 1.1366
diff -u -p -r1.1365 -r1.1366
--- kernel.spec	21 May 2009 23:19:09 -0000	1.1365
+++ kernel.spec	21 May 2009 23:27:48 -0000	1.1366
@@ -1941,6 +1941,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu May 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.4-66
+- Copy net-revert-forcedeth-power-down-phy-when-interface-is.patch
+  from F-11. This reverts only the power-down part of the original
+  upstream patch. (F11#501249)
+
 * Thu May 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.4-65
 - Linux 2.6.29.4
 

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

Index: net-revert-forcedeth-power-down-phy-when-interface-is.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/net-revert-forcedeth-power-down-phy-when-interface-is.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- net-revert-forcedeth-power-down-phy-when-interface-is.patch	14 May 2009 18:26:28 -0000	1.1
+++ net-revert-forcedeth-power-down-phy-when-interface-is.patch	21 May 2009 23:27:48 -0000	1.2
@@ -1,15 +1,14 @@
-From c1043da4aa23c180e36399f7c32cb909f7924c31 Mon Sep 17 00:00:00 2001
+From 20c6d5f67970a7dfc510d4bdc484bcc259610161 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"
+Date: Mon, 18 May 2009 13:01:28 -0400
+Subject: [PATCH] revert cb52deba12f27af90a46d2f8667a64888118a888
 
-This reverts commit cb52deba12f27af90a46d2f8667a64888118a888.
 ---
- drivers/net/forcedeth.c |   12 ++----------
- 1 files changed, 2 insertions(+), 10 deletions(-)
+ drivers/net/forcedeth.c |    8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
-index df0794e..3798f67 100644
+index df0794e..11ade32 100644
 --- a/drivers/net/forcedeth.c
 +++ b/drivers/net/forcedeth.c
 @@ -1446,9 +1446,9 @@ static int phy_init(struct net_device *dev)
@@ -24,18 +23,7 @@ index df0794e..3798f67 100644
  	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)
+@@ -5407,10 +5407,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);