summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-dev.h
diff options
context:
space:
mode:
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>2012-03-15 21:26:57 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-04-09 22:37:31 +0200
commita42506eb27aa4b8cbe3253b4d436c2f0a57e56e8 (patch)
tree9aa380359e20b4704bedf1266ac9aeb7ec217abe /drivers/net/wireless/iwlwifi/iwl-dev.h
parentiwlwifi: move ucode error log reporting to op_mode (diff)
downloadlinux-a42506eb27aa4b8cbe3253b4d436c2f0a57e56e8.tar.xz
linux-a42506eb27aa4b8cbe3253b4d436c2f0a57e56e8.zip
iwlwifi: move ucode_type from shared to op_mode
This variable holds the ucode currently running on the device; which is determined by op_mode, so move this parameter there. Also, the name of the variable is a bit misleading, so rename it to cur_ucode. Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@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-dev.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 2f54c9baa3df..99be58940e27 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -997,6 +997,9 @@ struct iwl_priv {
u32 error_event_table;
u32 log_event_table;
} device_pointers;
+
+ /* indicator of loaded ucode image */
+ enum iwl_ucode_type cur_ucode;
}; /*iwl_priv */
extern struct kmem_cache *iwl_tx_cmd_pool;