aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2015-01-14 14:39:34 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-01-22 10:54:09 -0500
commit57d7b6a4cda5a5247ab3b98a16a020af8e4f03fa (patch)
treed6cd78fb01d254dbe8097cb6548657db8b25858d /drivers/net/wireless
parentbe77c29cef285a8518078008a1751a90328f197c (diff)
iwlwifi: mvm: ignore temperature updates in the RX statistics notification
If the firmware sends spontaneous DTS notfications with the temperature (indicated in a TLV), we can ignore the temperature we get in the RX statistics notifications. This prevents potentially handling the same temperature change twice. It also ignores notifications with temperature equal to 0 that happens from time to time. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-fw-file.h2
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/rx.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
index 32e8b5bf2b3d..115e604e1ac9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
@@ -246,6 +246,7 @@ enum iwl_ucode_tlv_flag {
246 * the actual dwell time. 246 * the actual dwell time.
247 * @IWL_UCODE_TLV_API_SCD_CFG: This firmware can configure the scheduler 247 * @IWL_UCODE_TLV_API_SCD_CFG: This firmware can configure the scheduler
248 * through the dedicated host command. 248 * through the dedicated host command.
249 * @IWL_UCODE_TLV_API_ASYNC_DTM: Async temperature notifications are supported.
249 */ 250 */
250enum iwl_ucode_tlv_api { 251enum iwl_ucode_tlv_api {
251 IWL_UCODE_TLV_API_BT_COEX_SPLIT = BIT(3), 252 IWL_UCODE_TLV_API_BT_COEX_SPLIT = BIT(3),
@@ -255,6 +256,7 @@ enum iwl_ucode_tlv_api {
255 IWL_UCODE_TLV_API_FRAGMENTED_SCAN = BIT(8), 256 IWL_UCODE_TLV_API_FRAGMENTED_SCAN = BIT(8),
256 IWL_UCODE_TLV_API_BASIC_DWELL = BIT(13), 257 IWL_UCODE_TLV_API_BASIC_DWELL = BIT(13),
257 IWL_UCODE_TLV_API_SCD_CFG = BIT(15), 258 IWL_UCODE_TLV_API_SCD_CFG = BIT(15),
259 IWL_UCODE_TLV_API_ASYNC_DTM = BIT(17),
258}; 260};
259 261
260/** 262/**
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index 02e0f3703632..7919a7b00c7a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -516,7 +516,11 @@ int iwl_mvm_rx_statistics(struct iwl_mvm *mvm,
516 .mvm = mvm, 516 .mvm = mvm,
517 }; 517 };
518 518
519 iwl_mvm_tt_temp_changed(mvm, 519 /* Only handle rx statistics temperature changes if async temp
520 * notifications are not supported
521 */
522 if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_ASYNC_DTM))
523 iwl_mvm_tt_temp_changed(mvm,
520 le32_to_cpu(stats->general.radio_temperature)); 524 le32_to_cpu(stats->general.radio_temperature));
521 525
522 iwl_mvm_update_rx_statistics(mvm, stats); 526 iwl_mvm_update_rx_statistics(mvm, stats);