| commit | dd558f1e43567fd51a258f61081809e60735f9f4 | [log] [tgz] |
|---|---|---|
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | Thu Nov 10 06:55:04 2011 -0800 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Wed Jan 25 17:25:05 2012 -0800 |
| tree | 952d8363de10006622382cb30ae3d20b95ebb237 | |
| parent | bcbef18db94dfb991bd3025069b3413cbc52f8b6 [diff] [blame] |
iwlagn: check for SMPS mode commit b2ccccdca46273c7b321ecf5041c362cd950da20 upstream. Check and report WARN only when its invalid Resolves: https://bugzilla.kernel.org/show_bug.cgi?id=42621 https://bugzilla.redhat.com/show_bug.cgi?id=766071 Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index 39a3c9c..272bcdf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -442,6 +442,9 @@ mutex_lock(&priv->mutex); + if (test_bit(STATUS_EXIT_PENDING, &priv->status)) + goto out; + if (unlikely(test_bit(STATUS_SCANNING, &priv->status))) { IWL_DEBUG_MAC80211(priv, "leave - scanning\n"); goto out;