iwlwifi: mvm: don't run automatic checks if CT was caused by debugfs
authorLuciano Coelho <luciano.coelho@intel.com>
Wed, 20 Aug 2014 14:58:20 +0000 (17:58 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 3 Sep 2014 19:33:14 +0000 (22:33 +0300)
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>
drivers/net/wireless/iwlwifi/mvm/tt.c

index d31603cbb17d19ed22b22f94e8483009912137a3..4c22c0a092376560c9e6d9d06e0f73c47531972d 100644 (file)
@@ -319,8 +319,14 @@ static void iwl_mvm_enter_ctkill(struct iwl_mvm *mvm)
 
        IWL_ERR(mvm, "Enter CT Kill\n");
        iwl_mvm_set_hw_ctkill_state(mvm, true);
-       schedule_delayed_work(&mvm->thermal_throttle.ct_kill_exit,
-                             round_jiffies_relative(duration * HZ));
+
+       /* Don't schedule an exit work if we're in test mode, since
+        * the temperature will not change unless we manually set it
+        * again (or disable testing).
+        */
+       if (!mvm->temperature_test)
+               schedule_delayed_work(&mvm->thermal_throttle.ct_kill_exit,
+                                     round_jiffies_relative(duration * HZ));
 }
 
 static void iwl_mvm_exit_ctkill(struct iwl_mvm *mvm)