From fbf72ec0110b4439ee699b24104dc0cef477f1bb Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 20 Jun 2012 16:24:59 +0200 Subject: [PATCH] --- yaml --- r: 314835 b: refs/heads/master c: e9c03d18c4291c4351d6b9f74bd1278a761015a2 h: refs/heads/master i: 314833: 414cb9e5d288f0ec8baddbc7b3bbe06f244fb9ee 314831: 5f60a1c6fbb947a377c206fdb4925fd1ce3f7877 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/agn.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c2294f3fdc3..d24bb20a5d17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f8a9e76672202bfb55cc83b5fdc66306d3d170a +refs/heads/master: e9c03d18c4291c4351d6b9f74bd1278a761015a2 diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/agn.h b/trunk/drivers/net/wireless/iwlwifi/dvm/agn.h index 6d102413dd94..9bb16bdf6d26 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/agn.h +++ b/trunk/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 */