aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2014-08-20 10:58:20 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-09-03 15:33:14 -0400
commitefc36dbd5a0cbfbf0da0a6fa8e1c246bb78dab76 (patch)
treeb06abd6b964708dc35c836fc9d9fa0f74653257a
parentb689fa799a1450056044a47d6afa6ad52f3a8997 (diff)
iwlwifi: mvm: don't run automatic checks if CT was caused by debugfs
If we're manually testing the CT kill functionality via debugfs, we shouldn't schedule the work to recheck the temperature after the ct_kill_duration period has passed. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/tt.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/tt.c b/drivers/net/wireless/iwlwifi/mvm/tt.c
index d31603cbb17d..4c22c0a09237 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tt.c
@@ -319,8 +319,14 @@ static void iwl_mvm_enter_ctkill(struct iwl_mvm *mvm)
319 319
320 IWL_ERR(mvm, "Enter CT Kill\n"); 320 IWL_ERR(mvm, "Enter CT Kill\n");
321 iwl_mvm_set_hw_ctkill_state(mvm, true); 321 iwl_mvm_set_hw_ctkill_state(mvm, true);
322 schedule_delayed_work(&mvm->thermal_throttle.ct_kill_exit, 322
323 round_jiffies_relative(duration * HZ)); 323 /* Don't schedule an exit work if we're in test mode, since
324 * the temperature will not change unless we manually set it
325 * again (or disable testing).
326 */
327 if (!mvm->temperature_test)
328 schedule_delayed_work(&mvm->thermal_throttle.ct_kill_exit,
329 round_jiffies_relative(duration * HZ));
324} 330}
325 331
326static void iwl_mvm_exit_ctkill(struct iwl_mvm *mvm) 332static void iwl_mvm_exit_ctkill(struct iwl_mvm *mvm)