1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index cc282aa2f43c..371abbf60eac 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2509,13 +2509,8 @@ static void iwl3945_alive_start(struct iwl_priv *priv)
         /* After the ALIVE response, we can send commands to 3945 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;
@@ -2572,8 +2567,7 @@ static void __iwl3945_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);
 
         /* Station information will now be cleared in device */
         iwl_clear_ucode_stations(priv, NULL);
@@ -3775,12 +3769,9 @@ static void iwl3945_setup_deferred_work(struct iwl_priv *priv)
 
         iwl3945_hw_setup_deferred_work(priv);
 
-        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;
 
         tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
                      iwl3945_irq_tasklet, (unsigned long)priv);