rpms/kernel/F-11 linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch, NONE, 1.1 kernel.spec, 1.1619, 1.1620

[John W. Linville]

Author: linville

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

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-11/kernel.spec,v
retrieving revision 1.1619
retrieving revision 1.1620
diff -u -p -r1.1619 -r1.1620
--- kernel.spec	22 May 2009 02:05:50 -0000	1.1619
+++ kernel.spec	22 May 2009 16:44:33 -0000	1.1620
@@ -672,7 +672,8 @@ Patch682: linux-2.6-ipw2x00-age-scan-res
 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
-Patch686: mac80211-don-t-drop-nullfunc-frames-during-software.patch
+Patch686: linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch
+Patch687: mac80211-don-t-drop-nullfunc-frames-during-software.patch
 
 Patch700: linux-2.6-dma-debug-fixes.patch
 
@@ -1335,6 +1336,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
@@ -2002,6 +2004,10 @@ fi
 # and build.
 
 %changelog
+* Fri May 22 2009 John W. Linville <linville at redhat.com> - 2.6.29.3-158
+- back-port "iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll"
+- modify changelog entry from Apr 13 2009 to reference correct patch
+
 * Thu May 21 2009 Kyle McMartin <kyle at redhat.com> - 2.6.29.3-157
 - mac80211-don-t-drop-nullfunc-frames-during-software.patch:
    upstream a9a6ffffd05f97e6acbdeafc595e269855829751.
@@ -2324,7 +2330,7 @@ fi
     bbf6ad13, fa00e046 from alsa-kernel/master (and deps)
 
 * Mon Apr 13 2009 John W. Linville <linville at redhat.com>
-- Remove back-port iwlwifi rfkill while device down patches (#495003)
+- Remove "iwl3945: rely on priv->lock to protect priv access" (#495003)
 
 * Fri Apr 10 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Fix suspend/resume with Intel IOMMU, handle devices behind PCI-PCI