---

yaml --- r: 277865 b: refs/heads/master c: eb32043 h: refs/heads/master i: 277863: af78396 v: v3
git-mirror · Nov 11, 2011 · 6a6b944 · 6a6b944
1 parent 86f0da4
commit 6a6b944
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ddf6befb98d5dd61466a0e0e585037f6dca352f
+refs/heads/master: eb32043f430d74d4381b29273d174b376593d072
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -416,6 +416,8 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time)
 
 		if (!iwl_is_associated_ctx(ctx))
 			continue;
+		if (ctx->staging.dev_type == RXON_DEV_TYPE_P2P)
+			continue;
 		value = ctx->beacon_int;
 		if (!value)
 			value = IWL_PASSIVE_DWELL_BASE;