linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 06/12] iwlwifi: mvm: scan: enable adaptive dwell in p2p
Date: Sun, 20 Oct 2019 11:55:39 +0300	[thread overview]
Message-ID: <20191020085545.16407-5-luca@coelho.fi> (raw)
In-Reply-To: <20191020085545.16407-1-luca@coelho.fi>

From: Shahar S Matityahu <shahar.s.matityahu@intel.com>

Align to the requirement update and support adaptive dwell in p2p scan.

Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index adfaa5d01206..0ee8f4af940e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1639,8 +1639,7 @@ static u16 iwl_mvm_scan_umac_flags_v2(struct iwl_mvm *mvm,
 	    mvm->sched_scan_pass_all == SCHED_SCAN_PASS_ALL_ENABLED)
 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_NTFY_ITER_COMPLETE;
 
-	if (IWL_MVM_ADWELL_ENABLE &&
-	    vif->type != NL80211_IFTYPE_P2P_DEVICE)
+	if (IWL_MVM_ADWELL_ENABLE)
 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_V2_ADAPTIVE_DWELL;
 
 	if (type == IWL_MVM_SCAN_SCHED || type == IWL_MVM_SCAN_NETDETECT)
@@ -1692,8 +1691,7 @@ static u16 iwl_mvm_scan_umac_flags(struct iwl_mvm *mvm,
 	if (mvm->sched_scan_pass_all == SCHED_SCAN_PASS_ALL_ENABLED)
 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_ITER_COMPLETE;
 
-	if (iwl_mvm_is_adaptive_dwell_supported(mvm) && IWL_MVM_ADWELL_ENABLE &&
-	    vif->type != NL80211_IFTYPE_P2P_DEVICE)
+	if (iwl_mvm_is_adaptive_dwell_supported(mvm) && IWL_MVM_ADWELL_ENABLE)
 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_ADAPTIVE_DWELL;
 
 	/*
-- 
2.23.0


  parent reply	other threads:[~2019-10-20  8:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-20  8:55 [PATCH 00/12] iwlwifi: updates intended for v5.5 2019-20 Luca Coelho
2019-10-20  8:55 ` [PATCH 01/12] iwlwifi: remove redundant assignment to variable bufsz Luca Coelho
2019-10-20  8:55 ` [PATCH 02/12] iwlwifi: mvm: fix unaligned read of rx_pkt_status Luca Coelho
2019-10-20  8:55 ` [PATCH 03/12] iwlwifi: scan: make new scan req versioning flow Luca Coelho
2019-10-20 14:41   ` [PATCH v2 " Luca Coelho
2019-10-20  8:55 ` [PATCH 04/12] iwlwifi: scan: support scan req cmd ver 12 Luca Coelho
2019-10-20  8:55 ` [PATCH 05/12] iwlwifi: refactor the SAR tables from mvm to acpi Luca Coelho
2019-10-20  8:55 ` Luca Coelho [this message]
2019-10-20  8:55 ` [PATCH 07/12] iwlwifi: mvm: don't skip mgmt tid when flushing all tids Luca Coelho
2019-10-25  8:04   ` Kalle Valo
2019-10-20  8:55 ` [PATCH 08/12] iwlwifi: mvm: start CTDP budget from 2400mA Luca Coelho
2019-10-20  8:55 ` [PATCH 09/12] iwlwifi: mvm: sync the iwl_mvm_session_prot_notif layout Luca Coelho
2019-10-20  8:55 ` [PATCH 10/12] iwlwifi: remove IWL_DEVICE_22560/IWL_DEVICE_FAMILY_22560 Luca Coelho
2019-10-20  8:55 ` [PATCH 11/12] iwlwifi: 22000: fix some indentation Luca Coelho
2019-10-20  8:55 ` [PATCH 12/12] iwlwifi: mvm: fix non-ACPI function Luca Coelho
2020-01-23  4:02   ` Stable Backport Request: " Jiaxun Yang
2020-01-23  5:42   ` Jiaxun Yang

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=20191020085545.16407-5-luca@coelho.fi \
    --to=luca@coelho.fi \
    --cc=kvalo@codeaurora.org \
    --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).