diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-13 14:21:43 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-13 14:21:43 -0400 |
| commit | 42775a34d23027b19e984956a539448f5e7ff075 (patch) | |
| tree | e344340c7f0aed4c8faf7534fabbc64607a8e784 /drivers/net/wireless/iwlwifi/iwl-modparams.h | |
| parent | 433131ba03c511a84e1fda5669c70cf8b44702e1 (diff) | |
| parent | 4e3b3bcd81776527fa6f11624d68849de8c8802e (diff) | |
| download | op-kernel-dev-42775a34d23027b19e984956a539448f5e7ff075.zip op-kernel-dev-42775a34d23027b19e984956a539448f5e7ff075.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-modparams.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h index b29075c..d994317 100644 --- a/drivers/net/wireless/iwlwifi/iwl-modparams.h +++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h @@ -96,7 +96,7 @@ enum iwl_disable_11n { * use IWL_[DIS,EN]ABLE_HT_* constants * @amsdu_size_8K: enable 8K amsdu size, default = 0 * @restart_fw: restart firmware, default = 1 - * @wd_disable: enable stuck queue check, default = 0 + * @wd_disable: disable stuck queue check, default = 1 * @bt_coex_active: enable bt coex, default = true * @led_mode: system default, default = 0 * @power_save: disable power save, default = false |
