Fix bogus WARN in iwlwifi (rhbz 1071998)
This commit is contained in:
parent
84df599928
commit
6e2641ea1a
|
@ -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 */
|
||||
--
|
|
@ -794,6 +794,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
|
||||
|
@ -1534,6 +1537,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
|
||||
|
@ -2346,6 +2352,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Thu Mar 06 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Fix bogus WARN in iwlwifi (rhbz 1071998)
|
||||
|
||||
* Tue Mar 04 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Fix MAC-before-DAC check for mmap_zero (rhbz 1013466)
|
||||
- Fix hidp crash with apple bluetooth trackpads (rhbz 1027465)
|
||||
|
|
Loading…
Reference in New Issue