diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-02-13 23:56:22 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-13 23:56:22 +0400 |
commit | 6b8a3ecf30ddb0cad83242e74ca7be9440d51549 (patch) | |
tree | 7e81ba4417b172087c63a0fd24c6f6f49b7c2ce0 /drivers/net/wireless/iwlwifi/iwl-modparams.h | |
parent | 348f7d4adee97f222e3ad9ff97956ca3793d11c6 (diff) | |
parent | 205e2210daa975d92ace485a65a31ccc4077fe1a (diff) | |
download | linux-6b8a3ecf30ddb0cad83242e74ca7be9440d51549.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-modparams.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-modparams.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h index 0a84ade7edac..b29075c3da8e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-modparams.h +++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h @@ -79,9 +79,12 @@ enum iwl_power_level { IWL_POWER_NUM }; -#define IWL_DISABLE_HT_ALL BIT(0) -#define IWL_DISABLE_HT_TXAGG BIT(1) -#define IWL_DISABLE_HT_RXAGG BIT(2) +enum iwl_disable_11n { + IWL_DISABLE_HT_ALL = BIT(0), + IWL_DISABLE_HT_TXAGG = BIT(1), + IWL_DISABLE_HT_RXAGG = BIT(2), + IWL_ENABLE_HT_TXAGG = BIT(3), +}; /** * struct iwl_mod_params @@ -90,7 +93,7 @@ enum iwl_power_level { * * @sw_crypto: using hardware encryption, default = 0 * @disable_11n: disable 11n capabilities, default = 0, - * use IWL_DISABLE_HT_* constants + * 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 |