diff options
| author | Luca Coelho | 2016-12-27 09:18:18 +0100 |
|---|---|---|
| committer | Luca Coelho | 2017-04-11 13:54:31 +0200 |
| commit | 63f231fea02afbd364bbe77717bdee5a22daedd1 (patch) | |
| tree | 9ef5d48fcd07871e88050e52d6aead9a29f17e84 /drivers/net/wireless/intel/iwlwifi/pcie | |
| parent | iwlwifi: mvm: add DQA_ENABLE_CMD to the command list (diff) | |
| download | kernel-qcow2-linux-63f231fea02afbd364bbe77717bdee5a22daedd1.tar.gz kernel-qcow2-linux-63f231fea02afbd364bbe77717bdee5a22daedd1.tar.xz kernel-qcow2-linux-63f231fea02afbd364bbe77717bdee5a22daedd1.zip | |
iwlwifi: remove support for deprecated RF
One of the RF modules we support has been deprecated and never
released publicly. Remove support for this module.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/pcie')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index ba8a81cb0e2b..d38fcc1a4768 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -667,18 +667,11 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) iwl_trans->cfg = cfg_7265d; } - if (iwl_trans->cfg->rf_id) { - if (cfg == &iwl9460_2ac_cfg && - iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_LC) { - cfg = &iwl9000lc_2ac_cfg; - iwl_trans->cfg = cfg; - } - - if (cfg == &iwla000_2ac_cfg_hr && - iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_JF) { - cfg = &iwla000_2ac_cfg_jf; - iwl_trans->cfg = cfg; - } + if (iwl_trans->cfg->rf_id && + (cfg == &iwla000_2ac_cfg_hr && + iwl_trans->hw_rf_id == CSR_HW_RF_ID_TYPE_JF)) { + cfg = &iwla000_2ac_cfg_jf; + iwl_trans->cfg = cfg; } #endif |