diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-03 11:32:01 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:56:14 -0500 |
commit | 1023f3bc7b3f56da1f79f605cbe459318c4792ae (patch) | |
tree | d09ca3f7b19a0e3faedfee1a5c23b78f03b25541 /drivers/net/wireless/iwlegacy/4965-mac.c | |
parent | 00ea99e1d86b05e7ba90d66673b536b731af87cd (diff) |
iwlegacy: remove set_hw_params callback
We do not need that callback, settings parameters can be done locally.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965-mac.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 66 |
1 files changed, 59 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 2a52e7b7325a..235812ac6a0d 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -6079,7 +6079,34 @@ il4965_hw_detect(struct il_priv *il) | |||
6079 | D_INFO("HW Revision ID = 0x%X\n", il->rev_id); | 6079 | D_INFO("HW Revision ID = 0x%X\n", il->rev_id); |
6080 | } | 6080 | } |
6081 | 6081 | ||
6082 | static int | 6082 | static struct il_sensitivity_ranges il4965_sensitivity = { |
6083 | .min_nrg_cck = 97, | ||
6084 | .max_nrg_cck = 0, /* not used, set to 0 */ | ||
6085 | |||
6086 | .auto_corr_min_ofdm = 85, | ||
6087 | .auto_corr_min_ofdm_mrc = 170, | ||
6088 | .auto_corr_min_ofdm_x1 = 105, | ||
6089 | .auto_corr_min_ofdm_mrc_x1 = 220, | ||
6090 | |||
6091 | .auto_corr_max_ofdm = 120, | ||
6092 | .auto_corr_max_ofdm_mrc = 210, | ||
6093 | .auto_corr_max_ofdm_x1 = 140, | ||
6094 | .auto_corr_max_ofdm_mrc_x1 = 270, | ||
6095 | |||
6096 | .auto_corr_min_cck = 125, | ||
6097 | .auto_corr_max_cck = 200, | ||
6098 | .auto_corr_min_cck_mrc = 200, | ||
6099 | .auto_corr_max_cck_mrc = 400, | ||
6100 | |||
6101 | .nrg_th_cck = 100, | ||
6102 | .nrg_th_ofdm = 100, | ||
6103 | |||
6104 | .barker_corr_th_min = 190, | ||
6105 | .barker_corr_th_min_mrc = 390, | ||
6106 | .nrg_th_cca = 62, | ||
6107 | }; | ||
6108 | |||
6109 | static void | ||
6083 | il4965_set_hw_params(struct il_priv *il) | 6110 | il4965_set_hw_params(struct il_priv *il) |
6084 | { | 6111 | { |
6085 | il->hw_params.bcast_id = IL4965_BROADCAST_ID; | 6112 | il->hw_params.bcast_id = IL4965_BROADCAST_ID; |
@@ -6095,8 +6122,36 @@ il4965_set_hw_params(struct il_priv *il) | |||
6095 | if (il->cfg->mod_params->disable_11n) | 6122 | if (il->cfg->mod_params->disable_11n) |
6096 | il->cfg->sku &= ~IL_SKU_N; | 6123 | il->cfg->sku &= ~IL_SKU_N; |
6097 | 6124 | ||
6098 | /* Device-specific setup */ | 6125 | if (il->cfg->mod_params->num_of_queues >= IL_MIN_NUM_QUEUES && |
6099 | return il->ops->lib->set_hw_params(il); | 6126 | il->cfg->mod_params->num_of_queues <= IL49_NUM_QUEUES) |
6127 | il->cfg->num_of_queues = | ||
6128 | il->cfg->mod_params->num_of_queues; | ||
6129 | |||
6130 | il->hw_params.max_txq_num = il->cfg->num_of_queues; | ||
6131 | il->hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM; | ||
6132 | il->hw_params.scd_bc_tbls_size = | ||
6133 | il->cfg->num_of_queues * | ||
6134 | sizeof(struct il4965_scd_bc_tbl); | ||
6135 | |||
6136 | il->hw_params.tfd_size = sizeof(struct il_tfd); | ||
6137 | il->hw_params.max_stations = IL4965_STATION_COUNT; | ||
6138 | il->hw_params.max_data_size = IL49_RTC_DATA_SIZE; | ||
6139 | il->hw_params.max_inst_size = IL49_RTC_INST_SIZE; | ||
6140 | il->hw_params.max_bsm_size = BSM_SRAM_SIZE; | ||
6141 | il->hw_params.ht40_channel = BIT(IEEE80211_BAND_5GHZ); | ||
6142 | |||
6143 | il->hw_params.rx_wrt_ptr_reg = FH49_RSCSR_CHNL0_WPTR; | ||
6144 | |||
6145 | il->hw_params.tx_chains_num = il4965_num_of_ant(il->cfg->valid_tx_ant); | ||
6146 | il->hw_params.rx_chains_num = il4965_num_of_ant(il->cfg->valid_rx_ant); | ||
6147 | il->hw_params.valid_tx_ant = il->cfg->valid_tx_ant; | ||
6148 | il->hw_params.valid_rx_ant = il->cfg->valid_rx_ant; | ||
6149 | |||
6150 | il->hw_params.ct_kill_threshold = | ||
6151 | CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY); | ||
6152 | |||
6153 | il->hw_params.sens = &il4965_sensitivity; | ||
6154 | il->hw_params.beacon_time_tsf_bits = IL4965_EXT_BEACON_TIME_POS; | ||
6100 | } | 6155 | } |
6101 | 6156 | ||
6102 | static int | 6157 | static int |
@@ -6230,10 +6285,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
6230 | /************************ | 6285 | /************************ |
6231 | * 5. Setup HW constants | 6286 | * 5. Setup HW constants |
6232 | ************************/ | 6287 | ************************/ |
6233 | if (il4965_set_hw_params(il)) { | 6288 | il4965_set_hw_params(il); |
6234 | IL_ERR("failed to set hw parameters\n"); | ||
6235 | goto out_free_eeprom; | ||
6236 | } | ||
6237 | 6289 | ||
6238 | /******************* | 6290 | /******************* |
6239 | * 6. Setup il | 6291 | * 6. Setup il |