From: Emmanuel Grumbach <egrumbach@gmail.com>
To: linux-wireless@vger.kernel.org
Cc: David Spinadel <david.spinadel@intel.com>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 06/24] iwlwifi: mvm: notify sched scan complete from stop routine
Date: Thu, 15 May 2014 20:04:23 +0300 [thread overview]
Message-ID: <1400173481-9047-6-git-send-email-egrumbach@gmail.com> (raw)
In-Reply-To: <5374F373.6040902@gmail.com>
From: David Spinadel <david.spinadel@intel.com>
Add an option to notify mac80211 about sched scan complete from
iwl_mvm_stop_sched_scan(), to enable this notification when the
stop was called from within the driver.
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Reviewed-by: Alexander Bondar <alexander.bondar@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 ++--
drivers/net/wireless/iwlwifi/mvm/mvm.h | 2 +-
drivers/net/wireless/iwlwifi/mvm/scan.c | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 18d77e4..66fa21b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1542,7 +1542,7 @@ static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,
switch (mvm->scan_status) {
case IWL_MVM_SCAN_SCHED:
- ret = iwl_mvm_sched_scan_stop(mvm);
+ ret = iwl_mvm_sched_scan_stop(mvm, true);
if (ret) {
ret = -EBUSY;
goto out;
@@ -1882,7 +1882,7 @@ static int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,
int ret;
mutex_lock(&mvm->mutex);
- ret = iwl_mvm_sched_scan_stop(mvm);
+ ret = iwl_mvm_sched_scan_stop(mvm, false);
mutex_unlock(&mvm->mutex);
iwl_mvm_wait_for_async_handlers(mvm);
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index a4909f3..78f3328 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -857,7 +857,7 @@ int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
struct cfg80211_sched_scan_request *req);
int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
struct cfg80211_sched_scan_request *req);
-int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm);
+int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify);
int iwl_mvm_rx_sched_scan_results(struct iwl_mvm *mvm,
struct iwl_rx_cmd_buffer *rxb,
struct iwl_device_cmd *cmd);
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 3e25af4..a7f6ae3 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -936,7 +936,7 @@ static int iwl_mvm_send_sched_scan_abort(struct iwl_mvm *mvm)
return ret;
}
-int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm)
+int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify)
{
int ret;
struct iwl_notification_wait wait_scan_done;
@@ -974,5 +974,8 @@ int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm)
*/
mvm->scan_status = IWL_MVM_SCAN_NONE;
+ if (notify)
+ ieee80211_sched_scan_stopped(mvm->hw);
+
return 0;
}
--
1.8.3.2
next prev parent reply other threads:[~2014-05-15 17:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-15 17:03 pull request iwlwifi-next 2014-05-15 Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 01/24] iwlwifi: add missing trailing newlines to debug messages Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 02/24] iwlwifi: dvm: don't use _ni mac80211's callbacks Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 03/24] iwlwifi: 8000: add default NVM file name in family 8000 Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 04/24] iwlwifi: pcie: try to get ownership several times Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 05/24] iwlwifi: mvm: add channel 14 to the low band list Emmanuel Grumbach
2014-05-15 17:04 ` Emmanuel Grumbach [this message]
2014-05-15 17:04 ` [PATCH 07/24] iwlwifi: mvm: stop sched scan before association Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 08/24] iwlwifi: mvm: Add power management support for P2P DCM Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 09/24] iwlwifi: mvm: Disable uAPSD for a DCM client Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 10/24] iwlwifi: cause build error on missing newline Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 11/24] iwlwifi: remove spurious newline in Kconfig Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 12/24] iwlwifi: remove CMD_SYNC Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 13/24] iwlwifi: use dev_printk instead of dev_dbg for debug logs Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 14/24] iwlwifi: pcie: disable BHs in iwl_pcie_txq_check_wrptrs Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 15/24] iwlwifi: mvm: set SKIP_OVER_DTIM flag only if needed Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 16/24] iwlwifi: mvm: BT Coex - fix boost register / LUT values Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 17/24] iwlwifi: mvm: revisit the NVM handling code Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 18/24] iwlwifi: mvm: enable RX chain diversity if needed Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 19/24] iwlwifi: allow dynamic configuration of internal memory Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 20/24] iwlwifi: mvm: add uapsd_disable module parameter Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 21/24] iwlwifi: mvm: BT Coex - send channel inhibition before association Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 22/24] iwlwifi: mvm: combine p2p and station mac context functions Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 23/24] iwlwifi: update nmi register Emmanuel Grumbach
2014-05-15 17:04 ` [PATCH 24/24] iwlwifi: fix LED support Kconfig dependencies Emmanuel Grumbach
2014-05-16 18:19 ` pull request iwlwifi-next 2014-05-15 John W. Linville
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=1400173481-9047-6-git-send-email-egrumbach@gmail.com \
--to=egrumbach@gmail.com \
--cc=david.spinadel@intel.com \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
/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).