iwlwifi: store ucode version number

We store the ucode version number as part of
iwl_priv/iwl3945_priv. This enables us to determine
if particular ucode has support for features in order
to have driver support more than one ucode API.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index e8368b69d8c..5912cdec33a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1575,7 +1575,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
         const char *name = priv->cfg->fw_name;
         u8 *src;
         size_t len;
-        u32 ver, inst_size, data_size, init_size, init_data_size, boot_size;
+        u32 inst_size, data_size, init_size, init_data_size, boot_size;
 
         /* Ask kernel firmware_class module to get the boot firmware off disk.
          * request_firmware() is synchronous, file is in memory on return. */
@@ -1599,14 +1599,20 @@ static int iwl_read_ucode(struct iwl_priv *priv)
         /* Data from ucode file:  header followed by uCode images */
         ucode = (void *)ucode_raw->data;
 
-        ver = le32_to_cpu(ucode->ver);
+        priv->ucode_ver = le32_to_cpu(ucode->ver);
         inst_size = le32_to_cpu(ucode->inst_size);
         data_size = le32_to_cpu(ucode->data_size);
         init_size = le32_to_cpu(ucode->init_size);
         init_data_size = le32_to_cpu(ucode->init_data_size);
         boot_size = le32_to_cpu(ucode->boot_size);
 
-        IWL_DEBUG_INFO("f/w package hdr ucode version = 0x%x\n", ver);
+        IWL_DEBUG_INFO("f/w package hdr ucode version raw = 0x%x\n",
+                       priv->ucode_ver);
+        IWL_DEBUG_INFO("f/w package hdr ucode version = %u.%u.%u.%u\n",
+                       IWL_UCODE_MAJOR(priv->ucode_ver),
+                       IWL_UCODE_MINOR(priv->ucode_ver),
+                       IWL_UCODE_API(priv->ucode_ver),
+                       IWL_UCODE_SERIAL(priv->ucode_ver));
         IWL_DEBUG_INFO("f/w package hdr runtime inst size = %u\n",
                        inst_size);
         IWL_DEBUG_INFO("f/w package hdr runtime data size = %u\n",