From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga01.intel.com ([192.55.52.88]:55124 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754510Ab0IJPzF (ORCPT ); Fri, 10 Sep 2010 11:55:05 -0400 Subject: Re: [PATCH 09/14] iwlwifi: assure we complete scan in scan_abort and scan_check works From: "Guy, Wey-Yi" To: Stanislaw Gruszka Cc: Johannes Berg , "Chatre, Reinette" , "John W. Linville" , "linux-wireless@vger.kernel.org" In-Reply-To: <1284128807-11436-10-git-send-email-sgruszka@redhat.com> References: <1284128807-11436-1-git-send-email-sgruszka@redhat.com> <1284128807-11436-10-git-send-email-sgruszka@redhat.com> Content-Type: text/plain Date: Fri, 10 Sep 2010 08:54:18 -0700 Message-Id: <1284134058.6054.20.camel@wwguy-ubuntu> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Fri, 2010-09-10 at 07:26 -0700, Stanislaw Gruszka wrote: > Signed-off-by: Stanislaw Gruszka > --- > drivers/net/wireless/iwlwifi/iwl-scan.c | 14 ++------------ > 1 files changed, 2 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c > index ce605e0..da037b2 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-scan.c > +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c > @@ -490,18 +490,8 @@ static void iwl_bg_scan_check(struct work_struct *data) > struct iwl_priv *priv = > container_of(data, struct iwl_priv, scan_check.work); > > - if (test_bit(STATUS_EXIT_PENDING, &priv->status)) > - return; > - > mutex_lock(&priv->mutex); > - if (test_bit(STATUS_SCANNING, &priv->status) && > - !test_bit(STATUS_SCAN_ABORTING, &priv->status)) { > - IWL_DEBUG_SCAN(priv, "Scan completion watchdog (%dms)\n", > - jiffies_to_msecs(IWL_SCAN_CHECK_WATCHDOG)); > - > - if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) > - iwl_send_scan_abort(priv); > - } > + iwl_scan_cancel_timeout(priv, 200); > mutex_unlock(&priv->mutex); > } > > @@ -560,7 +550,7 @@ static void iwl_bg_abort_scan(struct work_struct *work) > cancel_delayed_work(&priv->scan_check); > > mutex_lock(&priv->mutex); > - iwl_do_scan_abort(priv); > + iwl_scan_cancel_timeout(priv, 200); > mutex_unlock(&priv->mutex); > } > Can we have some comments for the patch? Thanks Wey