summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/iwl-dev.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-02-17 02:39:19 -0800
committerReinette Chatre <reinette.chatre@intel.com>2010-03-09 16:05:42 -0800
commit67d613aed70194387edb1f8bf990f9cf197d3717 (patch)
tree52213b9bb89986c054de7e5dac9aba7050f4aa1f /drivers/net/wireless/iwlwifi/iwl-dev.h
parent949cd92c85fbdf9550582fc09271fa91cc802069 (diff)
downloadlwn-67d613aed70194387edb1f8bf990f9cf197d3717.tar.gz
lwn-67d613aed70194387edb1f8bf990f9cf197d3717.zip
iwlwifi: move 3945 clip groups to 3945 data
Only used on 3945, so it can be in the 3945-specific part of the data. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index ba404b99f4fe..90d2b6e0df76 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1092,10 +1092,6 @@ struct iwl_priv {
struct iwl_channel_info *channel_info; /* channel info array */
u8 channel_count; /* # of channels */
- /* each calibration channel group in the EEPROM has a derived
- * clip setting for each rate. 3945 only.*/
- const struct iwl3945_clip_group clip39_groups[5];
-
/* thermal calibration */
s32 temperature; /* degrees Kelvin */
s32 last_temperature;
@@ -1271,6 +1267,14 @@ struct iwl_priv {
/* Rx'd packet timing information */
u32 last_beacon_time;
u64 last_tsf;
+
+ /*
+ * each calibration channel group in the
+ * EEPROM has a derived clip setting for
+ * each rate.
+ */
+ const struct iwl3945_clip_group clip_groups[5];
+
} _3945;
#endif
#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)