iwlagn: check rf kill in queue stuck
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Mon, 10 Oct 2011 14:26:50 +0000 (07:26 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Oct 2011 18:48:09 +0000 (14:48 -0400)
check the RF KILL flag in queue stuck watch dog function

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-core.c

index 59d1968e6ae9554ce46283d09f6d98acbeb0c9f4..9cb6c755279ef6e45c745c6f384516d57686ff36 100644 (file)
@@ -1781,6 +1781,9 @@ void iwl_bg_watchdog(unsigned long data)
        if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status))
                return;
 
+       if (iwl_is_rfkill(priv->shrd))
+               return;
+
        timeout = priv->cfg->base_params->wd_timeout;
        if (timeout == 0)
                return;