From ebf122f23b9542c172291988b04c5179cf8f5955 Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Sun, 24 Jun 2012 15:51:59 +0300
Subject: [PATCH] --- yaml --- r: 315222 b: refs/heads/master c:
 020c876738bf6ea55687543bfd2c0227ddbd3126 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-drv.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 15d2fe5963b7..05fbfe5d741b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a6d2e0e727c3b126093c9b5fcdf41dd12bc4fd
+refs/heads/master: 020c876738bf6ea55687543bfd2c0227ddbd3126
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
index 095547b37a27..6322e2a692cc 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1011,6 +1011,7 @@ struct iwl_mod_params iwlwifi_mod_params = {
 	.power_level = IWL_POWER_INDEX_1,
 	.bt_ch_announce = true,
 	.auto_agg = true,
+	.wd_disable = true,
 	/* the rest are 0 by default */
 };
 EXPORT_SYMBOL_GPL(iwlwifi_mod_params);