[kernel/f18] Fix memset error in iwlwifi

[Josh Boyer]

commit 5d01e4986944da71da77a62a9d21705a417c1614
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed May 22 08:22:02 2013 -0400

    Fix memset error in iwlwifi

 iwlwifi-dvm-fix-memset.patch |   39 +++++++++++++++++++++++++++++++++++++++
 kernel.spec                  |    9 ++++++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/iwlwifi-dvm-fix-memset.patch b/iwlwifi-dvm-fix-memset.patch
new file mode 100644
index 0000000..ef063f2
--- /dev/null
+++ b/iwlwifi-dvm-fix-memset.patch
@@ -0,0 +1,39 @@
+From: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+
+In 63b77bf489881747c5118476918cc8c29378ee63
+
+	iwlwifi: dvm: don't send zeroed LQ cmd
+
+I tried to avoid to send zeroed LQ cmd, but I made a (very)
+stupid mistake in the memcmp.
+Since this patch has been ported to stable, the fix should
+go to stable too.
+
+This fixes https://bugzilla.kernel.org/show_bug.cgi?id=58341
+
+Change-Id: I0af4b3fdd537a1f674e85eb02dc0f5b5ac1ee7ac
+Cc: stable at vger.kernel.org
+Reported-by: Hinnerk van Bruinehsen <h.v.bruinehsen at fu-berlin.de>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+---
+Josh, this fix ugly -stable 3.8, 3.9 regression, please apply.
+
+ drivers/net/wireless/iwlwifi/dvm/sta.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c
+index 5175368..8212097 100644
+--- a/drivers/net/wireless/iwlwifi/dvm/sta.c
++++ b/drivers/net/wireless/iwlwifi/dvm/sta.c
+@@ -735,7 +735,7 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+ 					memcpy(&lq, priv->stations[i].lq,
+ 					       sizeof(struct iwl_link_quality_cmd));
+ 
+-				if (!memcmp(&lq, &zero_lq, sizeof(lq)))
++				if (memcmp(&lq, &zero_lq, sizeof(lq)))
+ 					send_lq = true;
+ 			}
+ 			spin_unlock_bh(&priv->sta_lock);
+-- 
+1.7.10.4
+
diff --git a/kernel.spec b/kernel.spec
index b063735..0e7f57a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 201
+%global baserelease 202
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -753,6 +753,8 @@ Patch25001: i7300_edac_single_mode_fixup.patch
 #rhbz 927469
 Patch25007: fix-child-thread-introspection.patch
 
+Patch25022: iwlwifi-dvm-fix-memset.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1444,6 +1446,8 @@ ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
 #rhbz 927469
 ApplyPatch fix-child-thread-introspection.patch
 
+ApplyPatch iwlwifi-dvm-fix-memset.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2289,6 +2293,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed May 22 2013 Josh Boyer <jwboyer at redhat.com>
+- Fix memset error in iwlwifi
+
 * Tue May 21 2013 Josh Boyer <jwboyer at redhat.com> - 3.9.3-201
 - Fix modules-extra signing with 3.9 kernels (rhbz 965181)