diff options
| author |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2017-11-02 10:02:04 +0200 |
|---|---|---|
| committer |   Luca Coelho <luciano.coelho@intel.com> | 2017-11-25 17:52:17 +0200 |
| commit | 76c5bcb3941d5b35248c1f4bc05c50e0af2a03e7 (patch) | |
| tree | bb435c1583b80cbad7a00eb36729e9f632b619e7 /drivers/net/wireless/intel/iwlwifi/iwl-drv.c | |
| parent | iwlwifi: mvm: remove TCP wakeup support (diff) | |
| download | linux-dev-76c5bcb3941d5b35248c1f4bc05c50e0af2a03e7.tar.xz linux-dev-76c5bcb3941d5b35248c1f4bc05c50e0af2a03e7.zip | |
iwlwifi: print the version number of the firmware in hex
Starting from a version 35, the minor version should be
printed in hexa.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@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 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 4b224d7d967c..de8f6ae2f51b 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -919,9 +919,14 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, minor = le32_to_cpup(ptr++); local_comp = le32_to_cpup(ptr); - snprintf(drv->fw.fw_version, - sizeof(drv->fw.fw_version), "%u.%u.%u", - major, minor, local_comp); + if (major >= 35) + snprintf(drv->fw.fw_version, + sizeof(drv->fw.fw_version), + "%u.%08x.%u", major, minor, local_comp); + else + snprintf(drv->fw.fw_version, + sizeof(drv->fw.fw_version), + "%u.%u.%u", major, minor, local_comp); break; } case IWL_UCODE_TLV_FW_DBG_DEST: { |