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>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
index 2fee4392be7f88f6f0e0a7e289e52500c2418d48..4e3422a1c7bbbe7a59e3666f9dd238c5da39f6c1 100644 (file)
--- 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;
        }