From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Mon, 10 Oct 2011 14:26:50 +0000 (-0700)
Subject: iwlagn: check rf kill in queue stuck
X-Git-Tag: MMI-PSA29.97-13-9~18194^2~83^2~83
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=46e7741ea176b6bb86d9d0ae5770c2e7528dc146;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

iwlagn: check rf kill in queue stuck

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>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 59d1968e6ae9..9cb6c755279e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -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;