rpms/kernel/FC-4 kernel-2.6.spec, 1.1468, 1.1469 linux-2.6-8139too-suspend.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-8139too-suspend.patch 
Log Message:
Further fixing to the 8139too suspend/resume problem.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1468
retrieving revision 1.1469
diff -u -r1.1468 -r1.1469
--- kernel-2.6.spec	4 Oct 2005 02:36:53 -0000	1.1468
+++ kernel-2.6.spec	5 Oct 2005 22:46:07 -0000	1.1469
@@ -1244,6 +1244,9 @@
 %endif
 
 %changelog
+* Wed Oct 05 2005 Dave Jones <davej at redhat.com>
+- Further fixing to the 8139too suspend/resume problem.
+
 * Mon Oct 03 2005 Dave Jones <davej at redhat.com> [2.6.13-1.1528_FC4]
 - 2.6.13.3
 
@@ -1253,7 +1256,7 @@
 * Sun Oct 02 2005 Dave Jones <davej at redhat.com>
 - Disable debug messages in w83781d sensor driver. (#169695)
 - Re-add a bunch of patches that got accidentally dropped in last update.
-  - Fix suspend/resume with 8319too
+  - Fix suspend/resume with 8139too
   - Fix usbhid/wireless security lock clash (#147479)
   - Missing check condition in ide scsi (#160868)
   - Fix nosense error with transcend usb keys (#162559)

linux-2.6-8139too-suspend.patch:
 8139too.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

Index: linux-2.6-8139too-suspend.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-8139too-suspend.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-8139too-suspend.patch	2 Oct 2005 23:20:08 -0000	1.1
+++ linux-2.6-8139too-suspend.patch	5 Oct 2005 22:46:07 -0000	1.2
@@ -18,3 +18,33 @@
  	rtl8139_init_ring (dev);
  	rtl8139_hw_start (dev);
  	netif_device_attach (dev);
+--- linux-2.6.13/drivers/net/8139too.c.orig	2005-10-04 15:34:39.497774524 -0400
++++ linux-2.6.13/drivers/net/8139too.c	2005-10-04 15:42:08.356105533 -0400
+@@ -552,7 +552,8 @@ const static struct {
+ 
+ 	{ "RTL-8100B/8139D",
+ 	  HW_REVID(1, 1, 1, 0, 1, 0, 1),
+-	  HasLWake,
++	  HasHltClk /* XXX undocumented? */
++	| HasLWake,
+ 	},
+ 
+ 	{ "RTL-8101",
+@@ -2597,17 +2598,11 @@ static int rtl8139_suspend (struct pci_d
+ static int rtl8139_resume (struct pci_dev *pdev)
+ {
+ 	struct net_device *dev = pci_get_drvdata (pdev);
+-	struct rtl8139_private *tp = netdev_priv(dev);
+-	void __iomem *ioaddr = tp->mmio_addr;
+ 
+ 	pci_restore_state (pdev);
+ 	if (!netif_running (dev))
+ 		return 0;
+ 	pci_set_power_state (pdev, PCI_D0);
+-
+-	/* Bring old chips out of low-power mode. */
+-	RTL_W8 (HltClk, 'R');
+-
+ 	rtl8139_init_ring (dev);
+ 	rtl8139_hw_start (dev);
+ 	netif_device_attach (dev);