summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-20 16:24:59 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-06-21 10:01:38 +0200
commite9c03d18c4291c4351d6b9f74bd1278a761015a2 (patch)
tree915e54020b4c619eba847af69d178b4313bef365 /drivers/net/wireless/iwlwifi
parent3f8a9e76672202bfb55cc83b5fdc66306d3d170a (diff)
downloadlinux-3.10-e9c03d18c4291c4351d6b9f74bd1278a761015a2.tar.gz
linux-3.10-e9c03d18c4291c4351d6b9f74bd1278a761015a2.tar.bz2
linux-3.10-e9c03d18c4291c4351d6b9f74bd1278a761015a2.zip
iwlwifi: increase scan timeout
When the first interface is active, then scanning on it or the second interface can take a little longer than 7s (I observed around 8s.) Bump the timeout to 15s to avoid aborting a scan that is still running, just taking more time. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/agn.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index 6d102413dd9..9bb16bdf6d2 100644
--- a/drivers/net/wireless/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -269,7 +269,7 @@ void iwl_scan_offchannel_skb_status(struct iwl_priv *priv);
#define IWL_ACTIVE_QUIET_TIME cpu_to_le16(10) /* msec */
#define IWL_PLCP_QUIET_THRESH cpu_to_le16(1) /* packets */
-#define IWL_SCAN_CHECK_WATCHDOG (HZ * 7)
+#define IWL_SCAN_CHECK_WATCHDOG (HZ * 15)
/* bt coex */