diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-05 13:06:13 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-26 09:15:36 +0200 |
| commit | 5dd9c68a854a77da2091b08d8fb7717b04667c6d (patch) | |
| tree | 7081f4b229c04e5b5a2257b2aa6b4ef189428d0b /drivers/net/wireless/iwlwifi/mvm/ops.c | |
| parent | cb2513bb71cfaedfb9af37c27744b0e5cef15aa3 (diff) | |
| download | lwn-5dd9c68a854a77da2091b08d8fb7717b04667c6d.tar.gz lwn-5dd9c68a854a77da2091b08d8fb7717b04667c6d.zip | |
iwlwifi: drop support for early versions of 8000
These early versions are no longer supported.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/ops.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/ops.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c index a28080ead54f..91361be3ecd8 100644 --- a/drivers/net/wireless/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/iwlwifi/mvm/ops.c @@ -522,15 +522,10 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, min_backoff = calc_min_backoff(trans, cfg); iwl_mvm_tt_initialize(mvm, min_backoff); /* set the nvm_file_name according to priority */ - if (iwlwifi_mod_params.nvm_file) { + if (iwlwifi_mod_params.nvm_file) mvm->nvm_file_name = iwlwifi_mod_params.nvm_file; - } else { - if ((trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) && - (CSR_HW_REV_STEP(trans->hw_rev) == SILICON_A_STEP)) - mvm->nvm_file_name = mvm->cfg->default_nvm_file_8000A; - else - mvm->nvm_file_name = mvm->cfg->default_nvm_file; - } + else + mvm->nvm_file_name = mvm->cfg->default_nvm_file; if (WARN(cfg->no_power_up_nic_in_init && !mvm->nvm_file_name, "not allowing power-up and not having nvm_file\n")) |