1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index 4eb3cad31aa9..8decf9953229 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -432,7 +432,7 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
                         mvm->status, table.valid);
         }
 
-        IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id,
+        IWL_ERR(mvm, "0x%08X | %s\n", table.error_id,
                 desc_lookup(table.error_id));
         IWL_ERR(mvm, "0x%08X | umac branchlink1\n", table.blink1);
         IWL_ERR(mvm, "0x%08X | umac branchlink2\n", table.blink2);
@@ -531,7 +531,8 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
 }
 
 void iwl_mvm_enable_txq(struct iwl_mvm *mvm, int queue, u16 ssn,
-                        const struct iwl_trans_txq_scd_cfg *cfg)
+                        const struct iwl_trans_txq_scd_cfg *cfg,
+                        unsigned int wdg_timeout)
 {
         struct iwl_scd_txq_cfg_cmd cmd = {
                 .scd_queue = queue,
@@ -545,11 +546,12 @@ void iwl_mvm_enable_txq(struct iwl_mvm *mvm, int queue, u16 ssn,
         };
 
         if (!iwl_mvm_is_scd_cfg_supported(mvm)) {
-                iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn, cfg);
+                iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn, cfg,
+                                         wdg_timeout);
                 return;
         }
 
-        iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn, NULL);
+        iwl_trans_txq_enable_cfg(mvm->trans, queue, ssn, NULL, wdg_timeout);
         WARN(iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0, sizeof(cmd), &cmd),
              "Failed to configure queue %d on FIFO %d\n", queue, cfg->fifo);
 }