diff options
author | Chatre, Reinette <reinette.chatre@intel.com> | 2008-12-02 15:14:05 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-05 09:35:55 -0500 |
commit | c02b3acd29766c6f79c2411cb5b85e1ee72c4c8f (patch) | |
tree | 2d7535f861a543a6578f9b0bfa594e2837ebaf17 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
parent | f3f911d1773d31f11038d90b04244bc3986c4ccd (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 5f6805bfec3f..a19fbb5eaae4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -462,7 +462,7 @@ struct fw_desc { | |||
462 | 462 | ||
463 | /* uCode file layout */ | 463 | /* uCode file layout */ |
464 | struct iwl_ucode { | 464 | struct iwl_ucode { |
465 | __le32 ver; /* major/minor/subminor */ | 465 | __le32 ver; /* major/minor/API/serial */ |
466 | __le32 inst_size; /* bytes of runtime instructions */ | 466 | __le32 inst_size; /* bytes of runtime instructions */ |
467 | __le32 data_size; /* bytes of runtime data */ | 467 | __le32 data_size; /* bytes of runtime data */ |
468 | __le32 init_size; /* bytes of initialization instructions */ | 468 | __le32 init_size; /* bytes of initialization instructions */ |
@@ -843,6 +843,8 @@ struct iwl_priv { | |||
843 | u8 rev_id; | 843 | u8 rev_id; |
844 | 844 | ||
845 | /* uCode images, save to reload in case of failure */ | 845 | /* uCode images, save to reload in case of failure */ |
846 | u32 ucode_ver; /* version of ucode, copy of | ||
847 | iwl_ucode.ver */ | ||
846 | struct fw_desc ucode_code; /* runtime inst */ | 848 | struct fw_desc ucode_code; /* runtime inst */ |
847 | struct fw_desc ucode_data; /* runtime data original */ | 849 | struct fw_desc ucode_data; /* runtime data original */ |
848 | struct fw_desc ucode_data_backup; /* runtime data save/restore */ | 850 | struct fw_desc ucode_data_backup; /* runtime data save/restore */ |