diff options
| author | Ido Yariv <idox.yariv@intel.com> | 2018-04-30 21:21:19 -0400 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2018-08-31 11:38:36 +0300 |
| commit | 06c34dee07c7de4f679267321c914db4b3c2a56f (patch) | |
| tree | f420e585b7d66199a3fe52d37fe7331d4744247d /drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | |
| parent | 317bc55fa82fbb7f1fe20170e50e0553af1bd69c (diff) | |
| download | lwn-06c34dee07c7de4f679267321c914db4b3c2a56f.tar.gz lwn-06c34dee07c7de4f679267321c914db4b3c2a56f.zip | |
iwlwifi: Add missing 11n disable module parameter check
In the new method of parsing the NVM the disable_11n module parameter
isn't consulted when setting up HT capabilities. Fix this.
Signed-off-by: Ido Yariv <idox.yariv@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c index 2fee4392be7f..4e3422a1c7bb 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c @@ -742,7 +742,9 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg, else rx_chains = hweight8(rx_chains); - if (!(data->sku_cap_11n_enable) || !cfg->ht_params) { + if (!(data->sku_cap_11n_enable) || + (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL) || + !cfg->ht_params) { ht_info->ht_supported = false; return; } |