diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:35:18 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:35:18 -0400 |
| commit | fd2841c5b59c276796f730b77ef37408c0909f9c (patch) | |
| tree | 34329300850e4addad576325840b6715e6894a9a /drivers/net/wireless/iwlwifi/iwl-drv.c | |
| parent | 0af5491c2f6069bb6cff4260619749a90a208c98 (diff) | |
| parent | 0ff1bd35f5aece42879b04cbfe6b4040cf50a697 (diff) | |
| download | op-kernel-dev-fd2841c5b59c276796f730b77ef37408c0909f9c.zip op-kernel-dev-fd2841c5b59c276796f730b77ef37408c0909f9c.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index a175997..cc41cfa 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c @@ -1013,6 +1013,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); |
