mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
iwlwifi: always restrict scan dwell in P2P
Whenever the PAN (P2P) context is active, it has timers in the uCode that prevent sleep, so scanning can't be out of channel for more than the beacon interval programmed into the device. Before this patch, a full scan including any passive channels when P2P was active would stall forever because it wouldn't find time to execute the passive requests (for default beacon intervals of 100 TU.) Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
dcc3ec04c1
commit
2ed81710cc
1 changed files with 18 additions and 3 deletions
|
@ -414,10 +414,25 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time)
|
|||
for_each_context(priv, ctx) {
|
||||
u16 value;
|
||||
|
||||
if (!iwl_is_associated_ctx(ctx))
|
||||
continue;
|
||||
if (ctx->staging.dev_type == RXON_DEV_TYPE_P2P)
|
||||
switch (ctx->staging.dev_type) {
|
||||
case RXON_DEV_TYPE_P2P:
|
||||
/* no timing constraints */
|
||||
continue;
|
||||
case RXON_DEV_TYPE_ESS:
|
||||
default:
|
||||
/* timing constraints if associated */
|
||||
if (!iwl_is_associated_ctx(ctx))
|
||||
continue;
|
||||
break;
|
||||
case RXON_DEV_TYPE_CP:
|
||||
case RXON_DEV_TYPE_2STA:
|
||||
/*
|
||||
* These seem to always have timers for TBTT
|
||||
* active in uCode even when not associated yet.
|
||||
*/
|
||||
break;
|
||||
}
|
||||
|
||||
value = ctx->beacon_int;
|
||||
if (!value)
|
||||
value = IWL_PASSIVE_DWELL_BASE;
|
||||
|
|
Loading…
Reference in a new issue