From 43dc625713b5ed3ae0e3253fdb0770079027823d Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Sat, 28 Jan 2012 08:30:52 -0800
Subject: [PATCH] --- yaml --- r: 290013 b: refs/heads/master c:
 2ed81710ccc0ccebe177481b8d4ac584f9c2b569 h: refs/heads/master i:   290011:
 02b35aa8f2daf0c52b6e6ef3d61dc274a0b70a27 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 067f85a41777..69c9bc084156 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcc3ec04c14d6d840fdcc5be0ddd752a7daf7ec4
+refs/heads/master: 2ed81710ccc0ccebe177481b8d4ac584f9c2b569
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
index 2aea20bf0f10..7f2e3a1c80ef 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -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;