diff options
author | Johannes Berg | 2016-04-28 14:40:59 +0200 |
---|---|---|
committer | Luca Coelho | 2016-07-05 23:08:21 +0200 |
commit | ca221c9b946cd4a9ea67375c8d90379a0e65179d (patch) | |
tree | c391691d12dca67b90065010638bbd4895aa7877 /drivers/net/wireless/intel/iwlwifi/iwl-fw.h | |
parent | iwlwifi: remove useless enum values (diff) | |
download | kernel-qcow2-linux-ca221c9b946cd4a9ea67375c8d90379a0e65179d.tar.gz kernel-qcow2-linux-ca221c9b946cd4a9ea67375c8d90379a0e65179d.tar.xz kernel-qcow2-linux-ca221c9b946cd4a9ea67375c8d90379a0e65179d.zip |
iwlwifi: change fw.mvm_fw to fw.type
Instead of explicitly indicating the difference between just
DVM and MVM with an mvm_fw boolean change this to fw.type to
be more extensible and easier to understand.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-fw.h')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-fw.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-fw.h b/drivers/net/wireless/intel/iwlwifi/iwl-fw.h index e461d631893a..655ec52a0c03 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-fw.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-fw.h @@ -231,6 +231,16 @@ struct iwl_gscan_capabilities { }; /** + * enum iwl_fw_type - iwlwifi firmware type + * @IWL_FW_DVM: DVM firmware + * @IWL_FW_MVM: MVM firmware + */ +enum iwl_fw_type { + IWL_FW_DVM, + IWL_FW_MVM, +}; + +/** * struct iwl_fw - variables associated with the firmware * * @ucode_ver: ucode version from the ucode file @@ -244,7 +254,7 @@ struct iwl_gscan_capabilities { * @inst_evtlog_ptr: event log offset for runtime ucode. * @inst_evtlog_size: event log size for runtime ucode. * @inst_errlog_ptr: error log offfset for runtime ucode. - * @mvm_fw: indicates this is MVM firmware + * @type: firmware type (&enum iwl_fw_type) * @cipher_scheme: optional external cipher scheme. * @human_readable: human readable version * @sdio_adma_addr: the default address to set for the ADMA in SDIO mode until @@ -275,7 +285,7 @@ struct iwl_fw { u8 valid_tx_ant; u8 valid_rx_ant; - bool mvm_fw; + enum iwl_fw_type type; struct ieee80211_cipher_scheme cs[IWL_UCODE_MAX_CS]; u8 human_readable[FW_VER_HUMAN_READABLE_SZ]; |