1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 32ab4a0215a0..d4075476670a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2654,13 +2654,8 @@ static void iwl_alive_start(struct iwl_priv *priv)
         /* After the ALIVE response, we can send host commands to the uCode */
         set_bit(STATUS_ALIVE, &priv->status);
 
-        if (priv->cfg->ops->lib->recover_from_tx_stall) {
-                /* Enable timer to monitor the driver queues */
-                mod_timer(&priv->monitor_recover,
-                        jiffies +
-                        msecs_to_jiffies(
-                          priv->cfg->base_params->monitor_recover_period));
-        }
+        /* Enable watchdog to monitor the driver tx queues */
+        iwl_setup_watchdog(priv);
 
         if (iwl_is_rfkill(priv))
                 return;
@@ -2755,8 +2750,7 @@ static void __iwl_down(struct iwl_priv *priv)
 
         /* Stop TX queues watchdog. We need to have STATUS_EXIT_PENDING bit set
          * to prevent rearm timer */
-        if (priv->cfg->ops->lib->recover_from_tx_stall)
-                del_timer_sync(&priv->monitor_recover);
+        del_timer_sync(&priv->watchdog);
 
         iwl_clear_ucode_stations(priv, NULL);
         iwl_dealloc_bcast_stations(priv);
@@ -3742,12 +3736,9 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
         priv->ucode_trace.data = (unsigned long)priv;
         priv->ucode_trace.function = iwl_bg_ucode_trace;
 
-        if (priv->cfg->ops->lib->recover_from_tx_stall) {
-                init_timer(&priv->monitor_recover);
-                priv->monitor_recover.data = (unsigned long)priv;
-                priv->monitor_recover.function =
-                        priv->cfg->ops->lib->recover_from_tx_stall;
-        }
+        init_timer(&priv->watchdog);
+        priv->watchdog.data = (unsigned long)priv;
+        priv->watchdog.function = iwl_bg_watchdog;
 
         if (!priv->cfg->base_params->use_isr_legacy)
                 tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))