From: Reinette Chatre <reinette.chatre@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
ipw3945-devel@lists.sourceforge.net,
Mohamed Abbas <mohamed.abbas@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>
Subject: [PATCH 11/11] iwlwifi: allow config if device not ready
Date: Mon, 20 Apr 2009 14:37:04 -0700 [thread overview]
Message-ID: <1240263424-8495-12-git-send-email-reinette.chatre@intel.com> (raw)
In-Reply-To: <1240263424-8495-11-git-send-email-reinette.chatre@intel.com>
From: Mohamed Abbas <mohamed.abbas@intel.com>
Allow user to config the device all the time but only allow commiting
these changes to card if the card is up and running.
Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-core.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index bf7ad51..3dec2d2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2474,12 +2474,6 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
mutex_lock(&priv->mutex);
- if (!iwl_is_ready(priv)) {
- IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
- ret = -EIO;
- goto out;
- }
-
IWL_DEBUG_MAC80211(priv, "enter to channel %d changed 0x%X\n",
conf->channel->hw_value, changed);
@@ -2574,6 +2568,11 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
goto out;
}
+ if (!iwl_is_ready(priv)) {
+ IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
+ goto out;
+ }
+
if (scan_active)
goto out;
--
1.5.6.3
next prev parent reply other threads:[~2009-04-20 21:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-20 21:36 [PATCH 0/11] iwlwifi driver updates 04/20/2009 Reinette Chatre
2009-04-20 21:36 ` [PATCH v2.6.30 and w-t 01/11] iwlwifi: fix EEPROM validation mask to include OTP only devices Reinette Chatre
2009-04-20 21:36 ` [PATCH 02/11] iwlwifi: rename PROBE_OPTION_MAX_API1 to PROBE_OPTION_MAX_3945 Reinette Chatre
2009-04-20 21:36 ` [PATCH 03/11] iwlwifi: improve scan support Reinette Chatre
2009-04-20 21:36 ` [PATCH 04/11] iwlwifi: support truly passive scanning Reinette Chatre
2009-04-20 21:36 ` [PATCH 05/11] iwl3945: add debugfs to 3945 Reinette Chatre
2009-04-20 21:36 ` [PATCH 06/11] iwl3945: calculate debugfs isr statistics Reinette Chatre
2009-04-20 21:37 ` [PATCH 07/11] iwlwifi: clean up unused NL80211_IFTYPE_MONITOR for Monitor mode Reinette Chatre
2009-04-20 21:37 ` [PATCH 08/11] iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll Reinette Chatre
2009-04-20 21:37 ` [PATCH 09/11] iwlcore: Fix stay in table function Reinette Chatre
2009-04-20 21:37 ` [PATCH 10/11] iwlwifi: remove radio disable parameter Reinette Chatre
2009-04-20 21:37 ` Reinette Chatre [this message]
2009-04-20 21:53 ` [PATCH 08/11] iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll reinette chatre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1240263424-8495-12-git-send-email-reinette.chatre@intel.com \
--to=reinette.chatre@intel.com \
--cc=ipw3945-devel@lists.sourceforge.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=mohamed.abbas@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox