summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-11-10 06:55:04 -0800
committerJohn W. Linville <linville@tuxdriver.com>2011-11-11 12:32:52 -0500
commitb2ccccdca46273c7b321ecf5041c362cd950da20 (patch)
tree27faff45ba7da3ed4e3f6913ab6b735498720409 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
parent75a56eccb01fcc3c1ae8000130f3c9b3c8ec68d9 (diff)
downloadop-kernel-dev-b2ccccdca46273c7b321ecf5041c362cd950da20.zip
op-kernel-dev-b2ccccdca46273c7b321ecf5041c362cd950da20.tar.gz
iwlagn: check for SMPS mode
Check and report WARN only when its invalid 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/wireless/iwlwifi/iwl-agn-rxon.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rxon.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 4c52bee..8e45fba 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -542,6 +542,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
mutex_lock(&priv->shrd->mutex);
+ if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status))
+ goto out;
+
if (unlikely(test_bit(STATUS_SCANNING, &priv->shrd->status))) {
IWL_DEBUG_MAC80211(priv, "leave - scanning\n");
goto out;
OpenPOWER on IntegriCloud