diff options
| author | Haim Dreyfuss <haim.dreyfuss@intel.com> | 2017-03-09 14:18:58 +0100 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2017-06-02 13:10:41 +0200 |
| commit | 0705b953eee4fe20b01ff8e13b8f32c7eac78446 (patch) | |
| tree | a0ce9ee6fa67a6e4eae676efee9a1a0477cb207c /drivers/net/wireless/intel/iwlwifi/iwl-drv.c | |
| parent | iwlwifi: pcie: support page dumping in wrt in gen2 (diff) | |
| download | linux-0705b953eee4fe20b01ff8e13b8f32c7eac78446.tar.xz linux-0705b953eee4fe20b01ff8e13b8f32c7eac78446.zip | |
iwlwifi: Add fw_name_pre_rf_next_step to support different rf steps
Integrated chip may have different HW and RF steps.
Currently, the driver supports only different HW steps.
Add logic to support different RF steps enables combining different
HW and RF steps.
Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 5cfacb0bca84..806933377c58 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -218,6 +218,10 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000 && CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_B_STEP) fw_pre_name = cfg->fw_name_pre_next_step; + else if (drv->trans->cfg->integrated && + CSR_HW_RFID_STEP(drv->trans->hw_rf_id) == SILICON_B_STEP && + cfg->fw_name_pre_rf_next_step) + fw_pre_name = cfg->fw_name_pre_rf_next_step; else fw_pre_name = cfg->fw_name_pre; |