Commit 63d76dc0 authored by Johannes Berg's avatar Johannes Berg

iwlwifi: fix 11n_disable EEPROM refactoring regression

My commit 26a7ca9a ("iwlwifi: refactor EEPROM reading/parsing")
broke the 11n_disable module parameter's BIT(0) to disable all HT
operation (using the other bits to disable aggregation only was
unaffected). Restore this by overriding the SKU when parsing the
EEPROM if the module parameter is set.
Reported-by: default avatarMatthijs Kooijman <matthijs@stdin.nl>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 601968b3
...@@ -853,6 +853,9 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg, ...@@ -853,6 +853,9 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
EEPROM_RADIO_CONFIG); EEPROM_RADIO_CONFIG);
data->sku = iwl_eeprom_query16(eeprom, eeprom_size, data->sku = iwl_eeprom_query16(eeprom, eeprom_size,
EEPROM_SKU_CAP); EEPROM_SKU_CAP);
if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
data->sku &= ~EEPROM_SKU_CAP_11N_ENABLE;
data->eeprom_version = iwl_eeprom_query16(eeprom, eeprom_size, data->eeprom_version = iwl_eeprom_query16(eeprom, eeprom_size,
EEPROM_VERSION); EEPROM_VERSION);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment