iwlwifi: increase scan timeout
authorJohannes Berg <johannes.berg@intel.com>
Wed, 20 Jun 2012 14:24:59 +0000 (16:24 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 21 Jun 2012 08:01:38 +0000 (10:01 +0200)
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>
drivers/net/wireless/iwlwifi/dvm/agn.h

index 6d102413dd94aec9690502f8423c1f47c405dab1..9bb16bdf6d26118ccc4bb6708934400c59b21c44 100644 (file)
@@ -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 */