rpms/kernel/F-10 linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch, NONE, 1.1 kernel.spec, 1.1368, 1.1369

[John W. Linville]

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch 
Log Message:
back-port "iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll"

linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch:

--- NEW FILE linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch ---
Back-port of the following upstream commit...

commit 71d449b55abf5018d7c711b2b62abc0c083723c4
Author: Reinette Chatre <reinette.chatre at intel.com>
Date:   Mon Apr 20 14:37:01 2009 -0700

    iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll
    
    Users reported lockup with work still trying to run
    after module has been unloaded.
    
    http://thread.gmane.org/gmane.linux.kernel.wireless.general/30594/focus=3060
    
    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
    Reported-by: TJ <ubuntu at tjworld.net>
    Reported-by: Huaxu Wan <huaxu.wan at linux.intel.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff -up linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-05-22 10:49:17.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-05-22 10:52:58.000000000 -0400
@@ -8110,7 +8110,7 @@ static void __devexit iwl3945_pci_remove
 	sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
 
 	iwl3945_rfkill_unregister(priv);
-	cancel_delayed_work(&priv->rfkill_poll);
+	cancel_delayed_work_sync(&priv->rfkill_poll);
 
 	iwl3945_dealloc_ucode_pci(priv);
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1368
retrieving revision 1.1369
diff -u -p -r1.1368 -r1.1369
--- kernel.spec	22 May 2009 04:03:37 -0000	1.1368
+++ kernel.spec	22 May 2009 17:26:43 -0000	1.1369
@@ -654,7 +654,8 @@ Patch681: linux-2.6-mac80211-age-scan-re
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 Patch683: linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
-Patch685: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
+Patch685: linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch
+Patch686: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
@@ -1303,6 +1304,7 @@ ApplyPatch linux-2.6-ipw2x00-age-scan-re
 # back-port iwlwifi rfkill while device down patches
 ApplyPatch linux-2.6-iwl3945-report-killswitch-changes-even-if-the-interface-is-down.patch
 ApplyPatch linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
+ApplyPatch linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch
 
 # back-port mac80211: fix beacon loss detection after scan
 ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
@@ -1941,6 +1943,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri May 22 2009 John W. Linville <linville at redhat.com> - 2.6.29.4-69
+- back-port "iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll"
+
 * Thu May 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.4-68
 - Disable alsa-pcm-midlevel-add-more-strict-buffer-position.patch
   because of F11 bug #498858.