rpms/kernel/F-10 linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.56, 1.1206.2.57

[John W. Linville]

Author: linville

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

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	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.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2009-04-02 15:03:20.000000000 -0400
+++ linux-2.6.27.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2009-04-02 15:03:34.000000000 -0400
@@ -7111,15 +7111,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 == IEEE80211_IF_TYPE_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-10/kernel.spec,v
retrieving revision 1.1206.2.56
retrieving revision 1.1206.2.57
diff -u -r1.1206.2.56 -r1.1206.2.57
--- kernel.spec	24 Mar 2009 02:45:53 -0000	1.1206.2.56
+++ kernel.spec	2 Apr 2009 19:10:37 -0000	1.1206.2.57
@@ -656,6 +656,7 @@
 Patch685: linux-2.6-rtl8187b-tx-status-feedback.patch
 Patch686: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch687: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+Patch688: linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
@@ -1303,6 +1304,7 @@
 # back-port scan result aging patches
 ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
+ApplyPatch linux-2.6-iwl3945-rely-on-priv-_lock-to-protect-priv-access.patch
 
 # NFS Client mounts hang when exported directory do not exist
 ApplyPatch linux-2.6-nfs-client-mounts-hang.patch
@@ -1971,6 +1973,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Apr  2 2009 John W. Linville <linville at redhat.com>  2.6.27.21-170.2.57
+- iwl3945: rely on priv->lock to protect priv access
+
 * Mon Mar 23 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.21-170.2.56
 - 2.6.27.21
 - Dropped patches, merged in -stable: