From: "Guy, Wey-Yi" <wey-yi.w.guy@intel.com>
To: Stanislaw Gruszka <sgruszka@redhat.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: use IWL_DEBUG_SCAN for debug scanning
Date: Mon, 13 Sep 2010 07:07:50 -0700 [thread overview]
Message-ID: <1284386870.23922.20.camel@wwguy-ubuntu> (raw)
In-Reply-To: <1284382005-3246-14-git-send-email-sgruszka@redhat.com>
On Mon, 2010-09-13 at 05:46 -0700, Stanislaw Gruszka wrote:
> Replace IWL_DEBUG_{INFO,HC,RC} to IWL_DEBUG_SCAN in iwl-scan.c file. Add
> some more IWL_DEBUG_SCAN messages. This will allow to fully debug
> scanning using only IWL_DL_SCAN flag.
>
> Also start one message sentence with capital letter, since that
> convention in iwl-scan.c file.
>
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> ---
> drivers/net/wireless/iwlwifi/iwl-scan.c | 31 +++++++++++++++++++------------
> 1 files changed, 19 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
> index 26dd8f3..65b7cb4 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-scan.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
> @@ -85,7 +85,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv)
> * can occur if we send the scan abort before we
> * the microcode has notified us that a scan is
> * completed. */
> - IWL_DEBUG_INFO(priv, "SCAN_ABORT ret %d.\n", pkt->u.status);
> + IWL_DEBUG_SCAN(priv, "SCAN_ABORT ret %d.\n", pkt->u.status);
> ret = -EIO;
> }
>
> @@ -192,7 +192,7 @@ static void iwl_rx_reply_scan(struct iwl_priv *priv,
> struct iwl_scanreq_notification *notif =
> (struct iwl_scanreq_notification *)pkt->u.raw;
>
> - IWL_DEBUG_RX(priv, "Scan request status = 0x%x\n", notif->status);
> + IWL_DEBUG_SCAN(priv, "Scan request status = 0x%x\n", notif->status);
> #endif
> }
>
> @@ -251,7 +251,7 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
> /* The HW is no longer scanning */
> clear_bit(STATUS_SCAN_HW, &priv->status);
>
> - IWL_DEBUG_INFO(priv, "Scan on %sGHz took %dms\n",
> + IWL_DEBUG_SCAN(priv, "Scan on %sGHz took %dms\n",
> (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
> jiffies_to_msecs(elapsed_jiffies
> (priv->scan_start, jiffies)));
> @@ -362,22 +362,22 @@ static int __must_check iwl_scan_initiate(struct iwl_priv *priv,
> cancel_delayed_work(&priv->scan_check);
>
> if (!iwl_is_ready_rf(priv)) {
> - IWL_WARN(priv, "request scan called when driver not ready.\n");
> + IWL_WARN(priv, "Request scan called when driver not ready.\n");
> return -EIO;
> }
>
> if (test_bit(STATUS_SCAN_HW, &priv->status)) {
> - IWL_DEBUG_INFO(priv,
> + IWL_DEBUG_SCAN(priv,
> "Multiple concurrent scan requests in parallel.\n");
> return -EBUSY;
> }
>
> if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
> - IWL_DEBUG_HC(priv, "Scan request while abort pending.\n");
> + IWL_DEBUG_SCAN(priv, "Scan request while abort pending.\n");
> return -EBUSY;
> }
>
> - IWL_DEBUG_INFO(priv, "Starting %sscan...\n",
> + IWL_DEBUG_SCAN(priv, "Starting %sscan...\n",
> internal ? "internal short " : "");
>
> set_bit(STATUS_SCANNING, &priv->status);
> @@ -427,9 +427,10 @@ int iwl_mac_hw_scan(struct ieee80211_hw *hw,
> * If an internal scan is in progress, just set
> * up the scan_request as per above.
> */
> - if (priv->is_internal_short_scan)
> + if (priv->is_internal_short_scan) {
> + IWL_DEBUG_SCAN(priv, "SCAN request during internal scan\n");
> ret = 0;
> - else
> + } else
> ret = iwl_scan_initiate(priv, vif, false,
> req->channels[0]->band);
>
> @@ -456,6 +457,8 @@ static void iwl_bg_start_internal_scan(struct work_struct *work)
> struct iwl_priv *priv =
> container_of(work, struct iwl_priv, start_internal_scan);
>
> + IWL_DEBUG_SCAN(priv, "Start internal scan\n");
> +
> mutex_lock(&priv->mutex);
>
> if (priv->is_internal_short_scan == true) {
> @@ -479,6 +482,8 @@ static void iwl_bg_scan_check(struct work_struct *data)
> struct iwl_priv *priv =
> container_of(data, struct iwl_priv, scan_check.work);
>
> + IWL_DEBUG_SCAN(priv, "Scan check work\n");
> +
> /* Since we are here firmware does not finish scan and
> * most likely is in bad shape, so we don't bother to
> * send abort command, just force scan complete to mac80211 */
> @@ -539,6 +544,8 @@ static void iwl_bg_abort_scan(struct work_struct *work)
> {
> struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan);
>
> + IWL_DEBUG_SCAN(priv, "Abort scan work\n");
> +
> /* We keep scan_check work queued in case when firmware will not
> * report back scan completed notification */
> mutex_lock(&priv->mutex);
> @@ -553,7 +560,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
> bool aborted;
> struct iwl_rxon_context *ctx;
>
> - IWL_DEBUG_INFO(priv, "Completed %sscan.\n",
> + IWL_DEBUG_SCAN(priv, "Completed %sscan.\n",
> priv->is_internal_short_scan ? "internal short " : "");
>
> cancel_delayed_work(&priv->scan_check);
> @@ -562,10 +569,10 @@ static void iwl_bg_scan_completed(struct work_struct *work)
>
> aborted = test_and_clear_bit(STATUS_SCAN_ABORTING, &priv->status);
> if (aborted)
> - IWL_DEBUG_INFO(priv, "Aborted scan completed.\n");
> + IWL_DEBUG_SCAN(priv, "Aborted scan completed.\n");
>
> if (!test_and_clear_bit(STATUS_SCANNING, &priv->status)) {
> - IWL_DEBUG_INFO(priv, "Scan already completed.\n");
> + IWL_DEBUG_SCAN(priv, "Scan already completed.\n");
> goto out;
> }
>
next prev parent reply other threads:[~2010-09-13 14:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 12:46 [PATCH 0/14 v4] iwlwifi: rewrite iwl-scan.c to avoid race conditions Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 01/14] iwlwifi: remove unused conf variables Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 02/14] iwlwifi: unify scan start checks Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 03/14] iwlwifi: move scan completed flags handling Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 04/14] iwlwifi: cancel scan when down the device Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 05/14] iwlwifi: report scan completion when abort fail Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 06/14] iwlwifi: rework iwl_scan_cancel_timeout Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 07/14] iwlwifi: rewrite scan completion Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 08/14] iwlwifi: force scan complete after timeout Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 09/14] iwlwifi: assure we complete scan in scan_abort and scan_check works Stanislaw Gruszka
2010-09-13 14:07 ` Guy, Wey-Yi
2010-09-13 12:46 ` [PATCH 10/14] iwlwifi: do not force complete scan too early Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 11/14] mac80211: wait for scan work complete before restarting hw Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 12/14] iwlwifi: cleanup scan initiate check Stanislaw Gruszka
2010-09-13 12:46 ` [PATCH 13/14] iwlwifi: use IWL_DEBUG_SCAN for debug scanning Stanislaw Gruszka
2010-09-13 14:07 ` Guy, Wey-Yi [this message]
2010-09-13 12:46 ` [PATCH 14/14] iwlwifi: apply settings when finishing scan Stanislaw Gruszka
2010-09-13 14:08 ` [PATCH 0/14 v4] iwlwifi: rewrite iwl-scan.c to avoid race conditions Guy, Wey-Yi
-- strict thread matches above, loose matches on Subject: below --
2010-09-10 14:26 [PATCH 0/14 v3] " Stanislaw Gruszka
2010-09-10 14:26 ` [PATCH 13/14] iwlwifi: use IWL_DEBUG_SCAN for debug scanning Stanislaw Gruszka
2010-09-10 15:56 ` Guy, Wey-Yi
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=1284386870.23922.20.camel@wwguy-ubuntu \
--to=wey-yi.w.guy@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=reinette.chatre@intel.com \
--cc=sgruszka@redhat.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;
as well as URLs for NNTP newsgroup(s).