summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-7000.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-17 10:36:29 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-05-27 13:11:42 +0200
commit0d8877a10d65f3c9bb84ad150e524d95ebd377fb (patch)
tree628329246e509f0a574b0fa017f2f55489e1b4c9 /drivers/net/wireless/iwlwifi/iwl-7000.c
parentee4d5471333c323693f79cdb7b145b40e12baa77 (diff)
iwlwifi: move some configuration parameters into DVM
There are a number of parameters that aren't really hardware specific but rather define how the DVM firmware is used. Move these into the DVM configuration. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-7000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-7000.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index c9aae2a2bbb..d4f3b4864ab 100644
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -96,10 +96,6 @@ static const struct iwl_base_params iwl7000_base_params = {
.pll_cfg_val = 0,
.shadow_ram_support = true,
.led_compensation = 57,
- .adv_thermal_throttle = true,
- .support_ct_kill_exit = true,
- .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
- .chain_noise_scale = 1000,
.wd_timeout = IWL_LONG_WD_TIMEOUT,
.max_event_log_size = 512,
.shadow_reg_enable = true,
@@ -118,10 +114,7 @@ static const struct iwl_ht_params iwl7000_ht_params = {
.max_inst_size = IWL60_RTC_INST_SIZE, \
.max_data_size = IWL60_RTC_DATA_SIZE, \
.base_params = &iwl7000_base_params, \
- /* TODO: .bt_params? */ \
- .need_temp_offset_calib = true, \
- .led_mode = IWL_LED_RF_STATE, \
- .adv_pm = true \
+ .led_mode = IWL_LED_RF_STATE
const struct iwl_cfg iwl7260_2ac_cfg = {