diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-12-11 13:33:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-12 14:45:37 -0500 |
commit | 29d51d9df53a4b383e2062b2ea0d575c9f3fca47 (patch) | |
tree | 7965331fc2a5626c129f890ed867e108ba49be42 /drivers/net/wireless | |
parent | edb342286e18c5bec6d3ac325851a9cba28061b9 (diff) |
iwlwifi: remove unused clip_groups priv member
Remove clip_groups from priv and related structure.
This code is for 3945 only and was renamed to 4965 in
when code was split.
Also remove unused RATE definitions
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h index 9873613afe31..6649f7b55650 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h | |||
@@ -84,12 +84,6 @@ | |||
84 | #define IWL_CMD_FIFO_NUM 4 | 84 | #define IWL_CMD_FIFO_NUM 4 |
85 | #define IWL49_FIRST_AMPDU_QUEUE 7 | 85 | #define IWL49_FIRST_AMPDU_QUEUE 7 |
86 | 86 | ||
87 | /* Tx rates */ | ||
88 | #define IWL_CCK_RATES 4 | ||
89 | #define IWL_OFDM_RATES 8 | ||
90 | #define IWL_HT_RATES 16 | ||
91 | #define IWL_MAX_RATES (IWL_CCK_RATES+IWL_OFDM_RATES+IWL_HT_RATES) | ||
92 | |||
93 | /* Time constants */ | 87 | /* Time constants */ |
94 | #define SHORT_SLOT_TIME 9 | 88 | #define SHORT_SLOT_TIME 9 |
95 | #define LONG_SLOT_TIME 20 | 89 | #define LONG_SLOT_TIME 20 |
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index fc859f72c07d..a520e47a5eb6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -186,12 +186,6 @@ struct iwl_channel_info { | |||
186 | u8 fat_extension_channel; /* HT_IE_EXT_CHANNEL_* */ | 186 | u8 fat_extension_channel; /* HT_IE_EXT_CHANNEL_* */ |
187 | }; | 187 | }; |
188 | 188 | ||
189 | struct iwl4965_clip_group { | ||
190 | /* maximum power level to prevent clipping for each rate, derived by | ||
191 | * us from this band's saturation power in EEPROM */ | ||
192 | const s8 clip_powers[IWL_MAX_RATES]; | ||
193 | }; | ||
194 | |||
195 | 189 | ||
196 | #define IWL_TX_FIFO_AC0 0 | 190 | #define IWL_TX_FIFO_AC0 0 |
197 | #define IWL_TX_FIFO_AC1 1 | 191 | #define IWL_TX_FIFO_AC1 1 |
@@ -793,10 +787,6 @@ struct iwl_priv { | |||
793 | struct iwl_channel_info *channel_info; /* channel info array */ | 787 | struct iwl_channel_info *channel_info; /* channel info array */ |
794 | u8 channel_count; /* # of channels */ | 788 | u8 channel_count; /* # of channels */ |
795 | 789 | ||
796 | /* each calibration channel group in the EEPROM has a derived | ||
797 | * clip setting for each rate. */ | ||
798 | const struct iwl4965_clip_group clip_groups[5]; | ||
799 | |||
800 | /* thermal calibration */ | 790 | /* thermal calibration */ |
801 | s32 temperature; /* degrees Kelvin */ | 791 | s32 temperature; /* degrees Kelvin */ |
802 | s32 last_temperature; | 792 | s32 last_temperature; |