[kernel/f20] Fix bogus WARN in iwlwifi (rhbz 1071998)

[Josh Boyer]

commit 4db738d62ce1a847baefeae4cba4829eb111b5a1
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Mar 6 09:22:21 2014 -0500

    Fix bogus WARN in iwlwifi (rhbz 1071998)

 bug-1071998.patch |   21 +++++++++++++++++++++
 kernel.spec       |    9 +++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/bug-1071998.patch b/bug-1071998.patch
new file mode 100644
index 0000000..d1b4385
--- /dev/null
+++ b/bug-1071998.patch
@@ -0,0 +1,21 @@
+@@ -, +, @@ 
+---
+ drivers/net/wireless/iwlwifi/mvm/coex.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c	
++++ a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c	
+@@ -1119,8 +1119,11 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+ 
+ 	lockdep_assert_held(&mvm->mutex);
+ 
+-	/* Rssi update while not associated ?! */
+-	if (WARN_ON_ONCE(mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT))
++	/*
++	 * Rssi update while not associated - can happen since the statistics
++	 * are handled asynchronously
++	 */
++	if (mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT)
+ 		return;
+ 
+ 	/* No BT - reports should be disabled */
+-- 
diff --git a/kernel.spec b/kernel.spec
index 1a86fa8..2575781 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -788,6 +788,9 @@ Patch25032: HID-Bluetooth-hidp-make-sure-input-buffers-are-big-e.patch
 #rhbz 1013466
 Patch25033: selinux-put-the-mmap-DAC-controls-before-the-MAC-controls.patch
 
+#rhbz 1071998
+Patch25034: bug-1071998.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1532,6 +1535,9 @@ ApplyPatch HID-Bluetooth-hidp-make-sure-input-buffers-are-big-e.patch
 #rhbz 1013466
 ApplyPatch selinux-put-the-mmap-DAC-controls-before-the-MAC-controls.patch
 
+#rhbz 1071998
+ApplyPatch bug-1071998.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2343,6 +2349,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Mar 06 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Fix bogus WARN in iwlwifi (rhbz 1071998)
+
 * Tue Mar 04 2014 Josh Boyer <jwboyer at fedoraproject.org>
 - Fix MAC-before-DAC check for mmap_zero (rhbz 1013466)
 - Fix hidp crash with apple bluetooth trackpads (rhbz 1027465)