diff options
| author | Sara Sharon <sara.sharon@intel.com> | 2016-03-07 16:55:20 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-03-30 16:21:27 +0300 |
| commit | 97f95c93c8ed5177371e75275f236513152fa308 (patch) | |
| tree | 1bccd1fe9435b8b24354e2fa0cd114dff4ca6b41 /drivers/net/wireless/intel/iwlwifi/iwl-drv.c | |
| parent | a0b09f13036cedfd67c9cb4b9d05138e7022723d (diff) | |
| download | lwn-97f95c93c8ed5177371e75275f236513152fa308.tar.gz lwn-97f95c93c8ed5177371e75275f236513152fa308.zip | |
iwlwifi: remove support for fw older than -16.ucode
API version lower than 16 is not supported anymore - don't
load older ucode.
Remove code handling older versions.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-drv.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 7cd17f0e45e8..9a680ac48820 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1255,10 +1255,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) if (err) goto try_again; - if (fw_has_api(&drv->fw.ucode_capa, IWL_UCODE_TLV_API_NEW_VERSION)) - api_ver = drv->fw.ucode_ver; - else - api_ver = IWL_UCODE_API(drv->fw.ucode_ver); + api_ver = drv->fw.ucode_ver; /* * api_ver should match the api version forming part of the |