rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memset error in iwlwifi

This commit is contained in:
Josh Boyer 2013-05-22 08:22:02 -04:00
parent 977738adfe
commit f1f97f7fa3
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
iwlwifi-dvm-fix-memset.patch Normal file
View File

@ -0,0 +1,39 @@
From: Emmanuel Grumbach <emmanuel.grumbach@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@vger.kernel.org
Reported-by: Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@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

9
kernel.spec
View File

@ -54,7 +54,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 100
%global baserelease 101
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -765,6 +765,8 @@ Patch25007: fix-child-thread-introspection.patch
#rhbz 844750
Patch25008: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
Patch25022: iwlwifi-dvm-fix-memset.patch
# END OF PATCH DEFINITIONS
%endif
@ -1488,6 +1490,8 @@ ApplyPatch fix-child-thread-introspection.patch
ApplyPatch 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
ApplyPatch iwlwifi-dvm-fix-memset.patch
# END OF PATCH APPLICATIONS
%endif
@ -2344,6 +2348,9 @@ fi
# '-' | |
# '-'
%changelog
* Wed May 22 2013 Josh Boyer <jwboyer@redhat.com>
- Fix memset error in iwlwifi
* Wed May 13 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.13-100
- Linux v3.8.13