rpms/kernel/F-11 linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch, NONE, 1.1 kernel.spec, 1.1503, 1.1504

[John W. Linville]

Author: linville

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch 
Log Message:
iwl3945: rely on priv->lock to protect priv access

linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch:

--- NEW FILE linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch ---
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-04-02 15:21:05.000000000 -0400
+++ linux-2.6.29.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-02 15:22:27.000000000 -0400
@@ -7101,15 +7101,12 @@ static int iwl3945_mac_conf_tx(struct ie
 	priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
 	priv->qos_data.qos_active = 1;
 
-	spin_unlock_irqrestore(&priv->lock, flags);
-
-	mutex_lock(&priv->mutex);
 	if (priv->iw_mode == NL80211_IFTYPE_AP)
 		iwl3945_activate_qos(priv, 1);
 	else if (priv->assoc_id && iwl3945_is_associated(priv))
 		iwl3945_activate_qos(priv, 0);
 
-	mutex_unlock(&priv->mutex);
+	spin_unlock_irqrestore(&priv->lock, flags);
 
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1503
retrieving revision 1.1504
diff -u -r1.1503 -r1.1504
--- kernel.spec	2 Apr 2009 18:28:13 -0000	1.1503
+++ kernel.spec	2 Apr 2009 19:29:01 -0000	1.1504
@@ -654,6 +654,7 @@
 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-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 
@@ -1253,6 +1254,9 @@
 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
 
+# fix locking in ipw3945 conf_tx callback
+ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 
@@ -1885,6 +1889,9 @@
 
 %changelog
 * Thu Apr 02 2009 John W. Linville <linville at redhat.com>
+- iwl3945: rely on priv->lock to protect priv access
+
+* Thu Apr 02 2009 John W. Linville <linville at redhat.com>
 - back-port iwlwifi rfkill while device down patches
 
 * Thu Apr 02 2009 Josef Bacik <josef at toxicpanda.com>