瀏覽代碼

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>
Ido Yariv 7 年之前
父節點
當前提交
06c34dee07
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c

+ 3 - 1
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;
 	}