---

yaml --- r: 266728 b: refs/heads/master c: 46e7741 h: refs/heads/master v: v3
git-mirror · Oct 14, 2011 · 7cb5d96 · 7cb5d96
1 parent f1c3b82
commit 7cb5d96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;