diff options
| author | Arik Nemtsov | 2015-09-30 10:19:55 +0200 |
|---|---|---|
| committer | Luca Coelho | 2015-10-05 13:02:07 +0200 |
| commit | 1a3fe0b2b6778b7866e2b3f5c9a299d5e9bbd89c (patch) | |
| tree | 77074d2910ff83fdaee5bb299d147e350d28c924 /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
| parent | iwlwifi: pci: add a few more PCI subvendor IDs for the 7265 series (diff) | |
| download | kernel-qcow2-linux-1a3fe0b2b6778b7866e2b3f5c9a299d5e9bbd89c.tar.gz kernel-qcow2-linux-1a3fe0b2b6778b7866e2b3f5c9a299d5e9bbd89c.tar.xz kernel-qcow2-linux-1a3fe0b2b6778b7866e2b3f5c9a299d5e9bbd89c.zip | |
iwlwifi: mvm: init card correctly on ctkill exit check
During the CT-kill exit flow, the card is powered up and partially
initialized to check if the temperature is already low enough.
Unfortunately the init bails early because the CT-kill flag is set.
Make the code bail early only for HW RF-kill, as was intended by the
author. CT-kill is self-imposed and is not really RF-kill.
Fixes: 31b8b343e019 ("iwlwifi: fix RFkill while calibrating")
Cc: <stable@vger.kernel.org> [3.18+]
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index b95a07ec9e36..c754051a4cea 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -860,6 +860,11 @@ static inline bool iwl_mvm_is_radio_killed(struct iwl_mvm *mvm) test_bit(IWL_MVM_STATUS_HW_CTKILL, &mvm->status); } +static inline bool iwl_mvm_is_radio_hw_killed(struct iwl_mvm *mvm) +{ + return test_bit(IWL_MVM_STATUS_HW_RFKILL, &mvm->status); +} + /* Must be called with rcu_read_lock() held and it can only be * released when mvmsta is not needed anymore. */ |