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>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 4b224d7d967cc3192a649778b5045f29429e43af..de8f6ae2f51bdbd15c3cfe26ecf374610c386844 100644 (file)
--- 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: {