rpms/kernel/devel linux-2.6-iwlwifi-irq_tasklet.patch, NONE, 1.1 kernel-2.6.spec, 1.3167, 1.3168

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31592

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-iwlwifi-irq_tasklet.patch 
Log Message:
fix iwl3945 module remove hang

linux-2.6-iwlwifi-irq_tasklet.patch:

--- NEW FILE linux-2.6-iwlwifi-irq_tasklet.patch ---
--- linux-2.6.21.i386/drivers/net/wireless/mac80211/iwlwifi/base.c.orig	2007-05-17 15:45:54.000000000 -0400
+++ linux-2.6.21.i386/drivers/net/wireless/mac80211/iwlwifi/base.c	2007-05-17 15:57:45.000000000 -0400
@@ -11515,6 +11515,13 @@ static void ipw_pci_remove(struct pci_de
 	 * when we are in fw error */
 	priv->status &= ~STATUS_FW_ERROR;
 
+	/*
+	 * kill irq_tasklet here, or else it could
+	 * run and leave interrupts enabled after
+	 * ipw_down has already completed
+	 */
+	tasklet_kill(&priv->irq_tasklet);
+
 	ipw_down(priv);
 
 	mutex_unlock(&priv->mutex);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3167
retrieving revision 1.3168
diff -u -r1.3167 -r1.3168
--- kernel-2.6.spec	17 May 2007 14:39:42 -0000	1.3167
+++ kernel-2.6.spec	18 May 2007 00:37:42 -0000	1.3168
@@ -606,6 +606,7 @@
 Patch2302: git-iwlwifi.patch
 Patch2303: linux-2.6-bcm43xx-pci-neuter.patch
 Patch2304: linux-2.6-iwlwifi-preferred_rate_control.patch
+Patch2305: linux-2.6-iwlwifi-irq_tasklet.patch
 
 # Assorted dyntick/clock/timer fixes.
 Patch2400: linux-2.6-highres-dyntick-avoid-xtime-lock-contention.patch
@@ -1370,10 +1371,12 @@
 %patch2301 -p1
 # ...and the iwlwifi driver from Intel
 %patch2302 -p1
-# ...and avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts
+# avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts
 %patch2303 -p1
-# ...and let iwl3945 specify its preferred rate control algorithm
+# let iwl3945 specify its preferred rate control algorithm
 %patch2304 -p1
+# kill iwl3945 irq_tasklet at module remove 
+%patch2305 -p1
 
 # Assorted dyntick/clock/timer fixes.
 %patch2400 -p1
@@ -2362,6 +2365,9 @@
 %endif
 
 %changelog
+* Thu May 17 2007 John W. Linville <linville at redhat.com>
+- iwl3945: kill irq_tasklet at module remove 
+
 * Thu May 17 2007 Dave Jones <davej at redhat.com>
 - More GFS2 updates.