diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-13 14:56:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-13 14:56:22 -0500 |
| commit | 6b8a3ecf30ddb0cad83242e74ca7be9440d51549 (patch) | |
| tree | 7e81ba4417b172087c63a0fd24c6f6f49b7c2ce0 /drivers/net/wireless/iwlwifi/iwl-drv.c | |
| parent | 348f7d4adee97f222e3ad9ff97956ca3793d11c6 (diff) | |
| parent | 205e2210daa975d92ace485a65a31ccc4077fe1a (diff) | |
| download | blackbird-op-linux-6b8a3ecf30ddb0cad83242e74ca7be9440d51549.tar.gz blackbird-op-linux-6b8a3ecf30ddb0cad83242e74ca7be9440d51549.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index c3728163be46..75103554cd63 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c @@ -1286,7 +1286,7 @@ module_param_named(swcrypto, iwlwifi_mod_params.sw_crypto, int, S_IRUGO); MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])"); module_param_named(11n_disable, iwlwifi_mod_params.disable_11n, uint, S_IRUGO); MODULE_PARM_DESC(11n_disable, - "disable 11n functionality, bitmap: 1: full, 2: agg TX, 4: agg RX"); + "disable 11n functionality, bitmap: 1: full, 2: disable agg TX, 4: disable agg RX, 8 enable agg TX"); module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K, int, S_IRUGO); MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size (default 0)"); |
