aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-10-10 10:26:50 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-14 14:48:09 -0400
commit46e7741ea176b6bb86d9d0ae5770c2e7528dc146 (patch)
tree4d0feec2db66ead289ca44a367d9581b32f95699 /drivers/net
parent317d09f76976c5a0b1e758fe45474a47cbea1aef (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 59d1968e6ae..9cb6c755279 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)
1781 if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status)) 1781 if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status))
1782 return; 1782 return;
1783 1783
1784 if (iwl_is_rfkill(priv->shrd))
1785 return;
1786
1784 timeout = priv->cfg->base_params->wd_timeout; 1787 timeout = priv->cfg->base_params->wd_timeout;
1785 if (timeout == 0) 1788 if (timeout == 0)
1786 return; 1789 return;