From 7cb5d96140790430384a2ac404e3c4e0b58385f9 Mon Sep 17 00:00:00 2001
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Mon, 10 Oct 2011 07:26:50 -0700
Subject: [PATCH] --- yaml --- r: 266728 b: refs/heads/master c:
 46e7741ea176b6bb86d9d0ae5770c2e7528dc146 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b8b0d3f66209..349d992db1e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 317d09f76976c5a0b1e758fe45474a47cbea1aef
+refs/heads/master: 46e7741ea176b6bb86d9d0ae5770c2e7528dc146
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
index 59d1968e6ae9..9cb6c755279e 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/trunk/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;