summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-shared.h
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2012-03-10 22:00:11 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-03-12 19:22:04 +0100
commitb5ea1624833b816184aa262c190f2774b8d2ea63 (patch)
treed59b11f5a01d1c54f7acfe4d8d59ec6085fa6df5 /drivers/net/wireless/iwlwifi/iwl-shared.h
parentiwlwifi: avoid some operations if no uCode loaded (diff)
downloadlinux-b5ea1624833b816184aa262c190f2774b8d2ea63.tar.xz
linux-b5ea1624833b816184aa262c190f2774b8d2ea63.zip
iwlwifi: explicitly track whether INIT uCode was run
Remove IWL_UCODE_NONE from enum iwl_ucode_type which, by being the default value in 0-initialized memory, implicitly allowed us to track whether any uCode had ever been loaded successfully (which would have been the INIT uCode) and instead explicitly track whether or not INIT uCode has been run. Signed-off-by: David Spinadel <david.spinadel@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-shared.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-shared.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index 29d2a85232fc..4cd2eced8a4c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -195,15 +195,13 @@ struct iwl_hw_params {
/**
* enum iwl_ucode_type
*
- * The type of ucode currently loaded on the hardware.
+ * The type of ucode.
*
- * @IWL_UCODE_NONE: No ucode loaded
* @IWL_UCODE_REGULAR: Normal runtime ucode
* @IWL_UCODE_INIT: Initial ucode
* @IWL_UCODE_WOWLAN: Wake on Wireless enabled ucode
*/
enum iwl_ucode_type {
- IWL_UCODE_NONE,
IWL_UCODE_REGULAR,
IWL_UCODE_INIT,
IWL_UCODE_WOWLAN,