diff options
author | Eran Harary <eran.harary@intel.com> | 2014-12-01 10:40:37 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-12-02 09:51:56 -0500 |
commit | 61df750cb00b69882ba3acbb82e9368d01119c93 (patch) | |
tree | 09b520e3053c82de3bf355402941043e2b22d234 /drivers/net/wireless/iwlwifi/iwl-fw.h | |
parent | 99684ae3567fde6b0f651ed6400e5306562d366e (diff) |
iwlwifi: mvm: Ability to work with packed usniffer image
The new ucode package format holds also the usniffer images
(in addition to the operational images and the TLVs).
The driver can load the usniffer image if debug
configuration tells it to.
Signed-off-by: Eran Harary <eran.harary@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-fw.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fw.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h index 20d44ea315ea..e6dc3b870949 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw.h | |||
@@ -77,11 +77,13 @@ | |||
77 | * @IWL_UCODE_REGULAR: Normal runtime ucode | 77 | * @IWL_UCODE_REGULAR: Normal runtime ucode |
78 | * @IWL_UCODE_INIT: Initial ucode | 78 | * @IWL_UCODE_INIT: Initial ucode |
79 | * @IWL_UCODE_WOWLAN: Wake on Wireless enabled ucode | 79 | * @IWL_UCODE_WOWLAN: Wake on Wireless enabled ucode |
80 | * @IWL_UCODE_REGULAR_USNIFFER: Normal runtime ucode when using usniffer image | ||
80 | */ | 81 | */ |
81 | enum iwl_ucode_type { | 82 | enum iwl_ucode_type { |
82 | IWL_UCODE_REGULAR, | 83 | IWL_UCODE_REGULAR, |
83 | IWL_UCODE_INIT, | 84 | IWL_UCODE_INIT, |
84 | IWL_UCODE_WOWLAN, | 85 | IWL_UCODE_WOWLAN, |
86 | IWL_UCODE_REGULAR_USNIFFER, | ||
85 | IWL_UCODE_TYPE_MAX, | 87 | IWL_UCODE_TYPE_MAX, |
86 | }; | 88 | }; |
87 | 89 | ||
@@ -231,4 +233,15 @@ iwl_fw_dbg_conf_enabled(const struct iwl_fw *fw, u8 id) | |||
231 | return trigger->enabled; | 233 | return trigger->enabled; |
232 | } | 234 | } |
233 | 235 | ||
236 | static inline bool | ||
237 | iwl_fw_dbg_conf_usniffer(const struct iwl_fw *fw, u8 id) | ||
238 | { | ||
239 | const struct iwl_fw_dbg_conf_tlv *conf_tlv = fw->dbg_conf_tlv[id]; | ||
240 | |||
241 | if (!conf_tlv) | ||
242 | return false; | ||
243 | |||
244 | return conf_tlv->usniffer; | ||
245 | } | ||
246 | |||
234 | #endif /* __iwl_fw_h__ */ | 247 | #endif /* __iwl_fw_h__ */ |