summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/iwl-shared.h
diff options
context:
space:
mode:
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>2012-03-15 13:26:57 -0700
committerJohn W. Linville <linville@tuxdriver.com>2012-04-09 16:37:31 -0400
commita42506eb27aa4b8cbe3253b4d436c2f0a57e56e8 (patch)
tree9aa380359e20b4704bedf1266ac9aeb7ec217abe /drivers/net/wireless/iwlwifi/iwl-shared.h
parent2fdfc476cf3bcf561448e290e00094de4ef4af5d (diff)
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-shared.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-shared.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index ef3f0b9064a8..90f464e4e88d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -346,7 +346,6 @@ struct iwl_cfg {
* @hw_params: see struct iwl_hw_params
* @lock: protect general shared data
* @eeprom: pointer to the eeprom/OTP image
- * @ucode_type: indicator of loaded ucode image
*/
struct iwl_shared {
unsigned long status;
@@ -360,9 +359,6 @@ struct iwl_shared {
/* eeprom -- this is in the card's little endian byte order */
u8 *eeprom;
- /* ucode related variables */
- enum iwl_ucode_type ucode_type;
-
};
/*Whatever _m is (iwl_trans, iwl_priv, these macros will work */