From: Stanislaw Gruszka <sgruszka@redhat.com>
To: "Guy, Wey-Yi W" <wey-yi.w.guy@intel.com>
Cc: Johannes Berg <johannes@sipsolutions.net>,
"Chatre, Reinette" <reinette.chatre@intel.com>,
"John W. Linville" <linville@tuxdriver.com>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH 13/14] iwlwifi: cleanup scan initiate check
Date: Fri, 10 Sep 2010 07:03:26 +0200 [thread overview]
Message-ID: <20100910050325.GB2398@redhat.com> (raw)
In-Reply-To: <E9954878DD1FB34FAE5187FB88C58A3501280FDC82@orsmsx506.amr.corp.intel.com>
Hi Wey
On Thu, Sep 09, 2010 at 08:46:57AM -0700, Guy, Wey-Yi W wrote:
> --- a/drivers/net/wireless/iwlwifi/iwl-scan.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
> @@ -361,7 +361,7 @@ static int __must_check iwl_scan_initiate(struct iwl_priv *priv,
>
> cancel_delayed_work(&priv->scan_check);
>
> - if (!iwl_is_ready(priv)) {
> + if (!iwl_is_ready_rf(priv)) {
> IWL_WARN(priv, "request scan called when driver not ready.\n");
> return -EIO;
> }
> @@ -372,26 +372,11 @@ static int __must_check iwl_scan_initiate(struct iwl_priv *priv,
> return -EBUSY;
> }
>
> - if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
> - IWL_DEBUG_SCAN(priv, "Aborting scan due to device shutdown\n");
> - return -EIO;
> - }
> -
> if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
> IWL_DEBUG_HC(priv, "Scan request while abort pending.\n");
> return -EBUSY;
> }
>
> - if (iwl_is_rfkill(priv)) {
> - IWL_DEBUG_HC(priv, "Aborting scan due to RF Kill activation\n");
> - return -EIO;
> - }
> -
> - if (!test_bit(STATUS_READY, &priv->status)) {
> - IWL_DEBUG_HC(priv, "Scan request while uninitialized.\n");
> - return -EBUSY;
> - }
> -
> IWL_DEBUG_INFO(priv, "Starting %sscan...\n",
> internal ? "internal short " : "");
>
>
> Same cleanup for 3945?
It's common code, we merge it in patch 2.
Stanislaw
next prev parent reply other threads:[~2010-09-10 5:03 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-09 13:52 [PATCH 0/16 v2] iwlwifi: rewrite iwl-scan.c to avoid race conditions Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 01/12] iwlwifi: remove unused conf variables Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 02/12] iwlwifi: unify scan start checks Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 03/12] iwlwifi: move scan completed flags handling Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 04/12] iwlwifi: cancel scan when down the device Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 05/12] iwlwifi: use IWL_DEBUG_SCAN Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 06/12] iwlwifi: report scan completion when abort fail Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 07/12] iwlwifi: rework iwl_scan_cancel_timeout Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 08/12] iwlwifi: rewrite scan completion Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 09/12] iwlwifi: force scan complete after timeout Stanislaw Gruszka
2010-09-09 15:50 ` Guy, Wey-Yi W
2010-09-10 5:15 ` Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 10/12] iwlwifi: assure we complete scan in scan_abort and scan_check works Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 11/12] iwlwifi: do not force complete scan too early Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 12/12] mac80211: wait for scan work complete before restarting hw Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 13/14] iwlwifi: cleanup scan initiate check Stanislaw Gruszka
2010-09-09 15:46 ` Guy, Wey-Yi W
2010-09-10 5:03 ` Stanislaw Gruszka [this message]
2010-09-09 13:52 ` [PATCH 14/16] iwlwifi: replace and add IWL_DEBUG_SCAN Stanislaw Gruszka
2010-09-09 15:52 ` Guy, Wey-Yi W
2010-09-09 13:52 ` [PATCH 15/15] iwlwifi: apply settings when finishing scan Stanislaw Gruszka
2010-09-09 13:52 ` [PATCH 16/16] iwlwifi: clear is_internal_short_scan when fail to initiate scan Stanislaw Gruszka
2010-09-09 15:35 ` Guy, Wey-Yi W
2010-09-10 5:17 ` Stanislaw Gruszka
2010-09-09 15:32 ` [PATCH 0/16 v2] iwlwifi: rewrite iwl-scan.c to avoid race conditions Guy, Wey-Yi W
2010-09-09 15:55 ` Stanislaw Gruszka
2010-09-09 15:57 ` Guy, Wey-Yi W
2010-09-09 16:06 ` Stanislaw Gruszka
2010-09-09 16:09 ` Guy, Wey-Yi W
2010-09-10 5:36 ` Stanislaw Gruszka
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=20100910050325.GB2398@redhat.com \
--to=sgruszka@redhat.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=reinette.chatre@intel.com \
--cc=wey-yi.w.guy@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.