diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-19 14:04:51 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-30 01:57:16 -0400 |
commit | 5d42e7b2a39d015180af44f8e56b0c2fc46874e1 (patch) | |
tree | a94a4b5dc0bea0fc6f476023adf858b3f90b129c /drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |
parent | 5dd9c68a854a77da2091b08d8fb7717b04667c6d (diff) |
iwlwifi: mvm: allow to configure the timeout for the Tx queues
Sometimes we will want to configure the timeouts for the
Tx queues based on the vif type. Allow to do that using the
trigger mechanism.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c index 581b3b8f29f9..09f0124db76e 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |||
@@ -470,9 +470,8 @@ exit_fail: | |||
470 | 470 | ||
471 | int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif) | 471 | int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif) |
472 | { | 472 | { |
473 | unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ? | 473 | unsigned int wdg_timeout = |
474 | mvm->cfg->base_params->wd_timeout : | 474 | iwl_mvm_get_wd_timeout(mvm, vif, false, false); |
475 | IWL_WATCHDOG_DISABLED; | ||
476 | u32 ac; | 475 | u32 ac; |
477 | int ret; | 476 | int ret; |
478 | 477 | ||