rpms/kernel/FC-4 jwltest-3c59x-resume-debug.patch, 1.1.2.1, 1.1.2.2 kernel-2.6.spec, 1.1387.4.1, 1.1387.4.2

[fedora-cvs-commits redhat com]

Author: linville

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

Modified Files:
      Tag: private-linville-fc4-jwltest-11-branch
	jwltest-3c59x-resume-debug.patch kernel-2.6.spec 
Log Message:


jwltest-3c59x-resume-debug.patch:
 3c59x.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+)

Index: jwltest-3c59x-resume-debug.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/Attic/jwltest-3c59x-resume-debug.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- jwltest-3c59x-resume-debug.patch	5 Jul 2005 18:37:25 -0000	1.1.2.1
+++ jwltest-3c59x-resume-debug.patch	5 Jul 2005 18:48:31 -0000	1.1.2.2
@@ -40,7 +40,7 @@
  	return 0;
  }
  
-@@ -1576,9 +1602,25 @@ vortex_up(struct net_device *dev)
+@@ -1576,9 +1602,27 @@ vortex_up(struct net_device *dev)
  	struct vortex_private *vp = netdev_priv(dev);
  	unsigned int config;
  	int i;
@@ -51,14 +51,16 @@
 +		printk (KERN_ERR PFX "Calling pci_enable_device\n");
  		pci_enable_device(VORTEX_PCI(vp));
 +
-+		pm = pci_find_capability(pdev, PCI_CAP_ID_PM);
++		pm = pci_find_capability(VORTEX_PCI(vp), PCI_CAP_ID_PM);
 +		if (pm) {
 +			u16 state;
 +
-+			pci_read_config_word(pdev, pm + PCI_PM_CTRL, &pmcsr);
++			pci_read_config_word(VORTEX_PCI(vp), pm + PCI_PM_CTRL,
++			                     &pmcsr);
 +			state = pmcsr & PCI_PM_CTRL_STATE_MASK;
-+			printk (KERN_ERR PFX "pdev->current_state %d\n",
-+			        pdev->current_state);
++			printk (KERN_ERR PFX
++			        "VORTEX_PCI(vp)->current_state %d\n",
++			        VORTEX_PCI(vp)->current_state);
 +			printk (KERN_ERR PFX "pmcsr state %d\n", state);
 +		}
 +


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1387.4.1
retrieving revision 1.1387.4.2
diff -u -r1.1387.4.1 -r1.1387.4.2
--- kernel-2.6.spec	5 Jul 2005 18:37:25 -0000	1.1387.4.1
+++ kernel-2.6.spec	5 Jul 2005 18:48:31 -0000	1.1387.4.2
@@ -310,6 +310,7 @@
 Patch1304: linux-2.6.12-net-atm-lanai-nodev-rmmod.patch
 Patch1305: jwltest-b44-link-check.patch
 Patch1306: jwltest-3c59x-resume.patch
+Patch1307: jwltest-3c59x-resume-debug.patch
 
 # USB bits
 Patch1400: linux-2.6.12-usb-old_scheme_first.patch
@@ -736,6 +737,7 @@
 %patch1305 -p1
 # fix 3c59x resume, use pci_enable_device for wake-up
 %patch1306 -p1
+%patch1307 -p1
 
 # USB Bits.
 # Enable both old and new style USB initialisation.