diff options
| author | Emmanuel Grumbach | 2014-11-02 14:48:09 +0100 |
|---|---|---|
| committer | Emmanuel Grumbach | 2014-11-03 14:29:17 +0100 |
| commit | 31b8b343e019e0a0c57ca9c13520a87f9cab884b (patch) | |
| tree | f8bb6b0e3894a4644318631ad857cb343c779902 /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
| parent | iwlwifi: mvm: initialize the cur_ucode upon boot (diff) | |
| download | kernel-qcow2-linux-31b8b343e019e0a0c57ca9c13520a87f9cab884b.tar.gz kernel-qcow2-linux-31b8b343e019e0a0c57ca9c13520a87f9cab884b.tar.xz kernel-qcow2-linux-31b8b343e019e0a0c57ca9c13520a87f9cab884b.zip | |
iwlwifi: fix RFkill while calibrating
If the RFkill interrupt fires while we calibrate, it would
make the firmware fail and the driver wasn't able to recover.
Change the flow so that the driver will kill the firmware
in that case.
Since we have now two flows that are calling
trans_stop_device (the RFkill interrupt and the
op_mode_mvm_start function) - we need to better sync this.
Use the STATUS_DEVICE_ENABLED in the pcie transport in an
atomic way to achieve this.
This fixes: https://bugzilla.kernel.org/show_bug.cgi?id=86231
CC: <stable@vger.kernel.org> [3.10+]
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index b153ced7015b..845429c88cf4 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -548,6 +548,7 @@ struct iwl_mvm { enum iwl_ucode_type cur_ucode; bool ucode_loaded; bool init_ucode_complete; + bool calibrating; u32 error_event_table; u32 log_event_table; u32 umac_error_event_table; |