44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From b2ccccdca46273c7b321ecf5041c362cd950da20 Mon Sep 17 00:00:00 2001
|
|
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
Date: Thu, 10 Nov 2011 06:55:04 -0800
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 +
|
|
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 3 +++
|
|
2 files changed, 4 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
|
|
index 1a52ed2..6465983 100644
|
|
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
|
|
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
|
|
@@ -827,6 +827,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt)
|
|
case IEEE80211_SMPS_STATIC:
|
|
case IEEE80211_SMPS_DYNAMIC:
|
|
return IWL_NUM_IDLE_CHAINS_SINGLE;
|
|
+ case IEEE80211_SMPS_AUTOMATIC:
|
|
case IEEE80211_SMPS_OFF:
|
|
return active_cnt;
|
|
default:
|
|
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;
|
|
--
|
|
1.7.7.5
|
|
|