rpms/kernel/FC-3 jwltest-3c59x-pm_state_valid.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.837.4.1, 1.837.4.2

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv28860

Modified Files:
      Tag: private-linville-fc3-jwltest-11-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-fc3-jwltest-11-branch
	jwltest-3c59x-pm_state_valid.patch 
Log Message:


jwltest-3c59x-pm_state_valid.patch:
 3c59x.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE jwltest-3c59x-pm_state_valid.patch ---
--- linux-2.6.11/drivers/net/3c59x.c.orig	2005-05-27 09:20:15.039431454 -0400
+++ linux-2.6.11/drivers/net/3c59x.c	2005-05-27 09:21:16.221279259 -0400
@@ -1581,7 +1581,8 @@ vortex_up(struct net_device *dev)
 
 	if (VORTEX_PCI(vp)) {
 		pci_set_power_state(VORTEX_PCI(vp), PCI_D0);	/* Go active */
-		pci_restore_state(VORTEX_PCI(vp));
+		if (vp->pm_state_valid)
+			pci_restore_state(VORTEX_PCI(vp));
 		pci_enable_device(VORTEX_PCI(vp));
 	}
 
@@ -2741,6 +2742,7 @@ vortex_down(struct net_device *dev, int 
 		outl(0, ioaddr + DownListPtr);
 
 	if (final_down && VORTEX_PCI(vp)) {
+		vp->pm_state_valid = 1;
 		pci_save_state(VORTEX_PCI(vp));
 		acpi_set_WOL(dev);
 	}
@@ -3243,9 +3245,10 @@ static void acpi_set_WOL(struct net_devi
 		outw(RxEnable, ioaddr + EL3_CMD);
 
 		pci_enable_wake(VORTEX_PCI(vp), 0, 1);
+
+		/* Change the power state to D3; RxEnable doesn't take effect. */
+		pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);
 	}
-	/* Change the power state to D3; RxEnable doesn't take effect. */
-	pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);
 }
 
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v
retrieving revision 1.837.4.1
retrieving revision 1.837.4.2
diff -u -r1.837.4.1 -r1.837.4.2
--- kernel-2.6.spec	27 May 2005 13:17:25 -0000	1.837.4.1
+++ kernel-2.6.spec	27 May 2005 13:23:57 -0000	1.837.4.2
@@ -292,6 +292,7 @@
 Patch1370: jwltest-ixgb-update-1_0_90-k2.patch
 Patch1371: jwltest-ixgb-update-1_0_95-k2.patch
 Patch1372: jwltest-tg3-3_27.patch
+Patch1373: jwltest-3c59x-pm_state_valid.patch
 
 # USB bits
 Patch1400: linux-2.6.10-usb-use_both_schemes.patch
@@ -594,6 +595,8 @@
 %patch1371 -p1
 # tg3 update to 3.27
 %patch1372 -p1
+# stop 3c59x from re-entering current PM state
+%patch1373 -p1
 
 # USB Bits.
 # Enable both old and new style USB initialisation.