linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: linux-wireless@vger.kernel.org
Cc: David Spinadel <david.spinadel@intel.com>,
	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 09/21] iwlwifi: mvm: fix extended dwell time
Date: Thu,  7 Jan 2016 14:47:29 +0200	[thread overview]
Message-ID: <1452170861-10060-9-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <0BA3FCBA62E2DC44AF3030971E174FB32E9836B4@hasmsx107.ger.corp.intel.com>

From: David Spinadel <david.spinadel@intel.com>

FW adds 10 msec for every dwell time in low band, so we need
to set 10 msec less.
Don't use extended dwell time when fragmented scan is needed
because FW adds 3 msec per probe and it can easily exceed
max out of channel time.

Fixes: c3e230b167a9 ("iwlwifi: mvm: add extended dwell time")
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index bee3201..9a15642 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -92,7 +92,7 @@ static struct iwl_mvm_scan_timing_params scan_timing[] = {
 		.dwell_active = 10,
 		.dwell_passive = 110,
 		.dwell_fragmented = 44,
-		.dwell_extended = 100,
+		.dwell_extended = 90,
 		.suspend_time = 0,
 		.max_out_time = 0,
 	},
@@ -100,7 +100,7 @@ static struct iwl_mvm_scan_timing_params scan_timing[] = {
 		.dwell_active = 10,
 		.dwell_passive = 110,
 		.dwell_fragmented = 44,
-		.dwell_extended = 100,
+		.dwell_extended = 90,
 		.suspend_time = 30,
 		.max_out_time = 120,
 	},
@@ -108,7 +108,7 @@ static struct iwl_mvm_scan_timing_params scan_timing[] = {
 		.dwell_active = 10,
 		.dwell_passive = 110,
 		.dwell_fragmented = 44,
-		.dwell_extended = 100,
+		.dwell_extended = 90,
 		.suspend_time = 120,
 		.max_out_time = 120,
 	},
@@ -116,7 +116,6 @@ static struct iwl_mvm_scan_timing_params scan_timing[] = {
 		.dwell_active = 10,
 		.dwell_passive = 110,
 		.dwell_fragmented = 44,
-		.dwell_extended = 44,
 		.suspend_time = 95,
 		.max_out_time = 44,
 	},
@@ -790,7 +789,8 @@ static int iwl_mvm_scan_lmac_flags(struct iwl_mvm *mvm,
 #endif
 
 	if (iwl_mvm_is_regular_scan(params) &&
-	    vif->type != NL80211_IFTYPE_P2P_DEVICE)
+	    vif->type != NL80211_IFTYPE_P2P_DEVICE &&
+	    params->type != IWL_SCAN_TYPE_FRAGMENTED)
 		flags |= IWL_MVM_LMAC_SCAN_FLAG_EXTENDED_DWELL;
 
 	return flags;
@@ -1072,7 +1072,8 @@ static u32 iwl_mvm_scan_umac_flags(struct iwl_mvm *mvm,
 #endif
 
 	if (iwl_mvm_is_regular_scan(params) &&
-	    vif->type != NL80211_IFTYPE_P2P_DEVICE)
+	    vif->type != NL80211_IFTYPE_P2P_DEVICE &&
+	    params->type != IWL_SCAN_TYPE_FRAGMENTED)
 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_EXTENDED_DWELL;
 
 	return flags;
-- 
2.5.0


  parent reply	other threads:[~2016-01-07 12:47 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-07 12:46 pull request: iwlwifi-next 2016-01-07 Grumbach, Emmanuel
2016-01-07 12:47 ` [PATCH 01/21] iwlwifi: dvm: fix WoWLAN Emmanuel Grumbach
2016-01-07 21:15   ` Kalle Valo
2016-01-08  8:08     ` Grumbach, Emmanuel
2016-01-07 12:47 ` [PATCH 02/21] iwlwifi: update and fix 7265 series PCI IDs Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 03/21] iwlwifi: mvm: let the firmware choose the antenna for beacons Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 04/21] iwlwifi: mvm: change mcc update API Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 05/21] iwlwifi: mvm: reset mvm->scan_type when firmware is started Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 06/21] iwlwifi: set max firmware version of 7265 to 17 Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 07/21] iwlwifi: mvm: bump max API to 20 Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 08/21] iwlwifi: nvm: fix loading default NVM file Emmanuel Grumbach
2016-01-07 12:47 ` Emmanuel Grumbach [this message]
2016-01-07 12:47 ` [PATCH 10/21] iwlwifi: mvm: dump the radio registers when the firmware crashes Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 11/21] iwlwifi: mvm: add a non-trigger window to fw dbg triggers Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 12/21] iwlwifi: mvm: support A-MSDU in A-MPDU Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 13/21] iwlwifi: mvm: remove useless WARN_ON and rely on cfg80211's combination Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 14/21] iwlwifi: mvm: prevent multiple stations with the same address Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 15/21] iwlwifi: mvm: don't ask beacons when P2P GO vif and no assoc sta Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 16/21] iwlwifi: mvm: check PN for CCMP/GCMP in the driver Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 17/21] iwlwifi: mvm: initialize gtkdata->mvm correctly Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 18/21] iwlwifi: mvm: check minimum temperature notification length Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 19/21] iwlwifi: mvm: constify the parameters of a few functions in fw-dbg.c Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 20/21] iwlwifi: mvm: fix memory leaks in error paths upon fw error dump Emmanuel Grumbach
2016-01-07 12:47 ` [PATCH 21/21] iwlwifi: pcie: properly configure the debug buffer size for 8000 Emmanuel Grumbach
2016-01-07 17:05 ` pull request: iwlwifi-next 2016-01-07 Grumbach, Emmanuel
2016-01-07 21:08   ` Kalle Valo
2016-01-08  8:12     ` Grumbach, Emmanuel
2016-01-08  8:42       ` Kalle Valo

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=1452170861-10060-9-git-send-email-emmanuel.grumbach@intel.com \
    --to=emmanuel.grumbach@intel.com \
    --cc=david.spinadel@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).