diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-09-22 18:02:08 +0200 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-10-07 15:52:15 -0700 |
| commit | 0453674c90be7b39c8925ba5e1d746447905f8ee (patch) | |
| tree | 9630487b83e15fed50e740938f10ad8c79c25c95 /drivers/net/wireless/iwlwifi/iwl-1000.c | |
| parent | 84fac3d9604147db37bd8c68897f79442d7ed714 (diff) | |
| download | kernel_samsung_smdk4412-0453674c90be7b39c8925ba5e1d746447905f8ee.zip kernel_samsung_smdk4412-0453674c90be7b39c8925ba5e1d746447905f8ee.tar.gz kernel_samsung_smdk4412-0453674c90be7b39c8925ba5e1d746447905f8ee.tar.bz2 | |
iwlwifi: remove set_ct_kill operation
This operation is only ever called from set_hw_params,
which is also already based on the config/ops, so that
there's no need to have a separate set_ct_kill op and
we can just call the right ct_threshold function.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 8c2db55..8aed9ea 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c @@ -151,8 +151,7 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant; priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant; - if (priv->cfg->ops->lib->temp_ops.set_ct_kill) - priv->cfg->ops->lib->temp_ops.set_ct_kill(priv); + iwl1000_set_ct_threshold(priv); /* Set initial sensitivity parameters */ /* Set initial calibration set */ @@ -219,7 +218,6 @@ static struct iwl_lib_ops iwl1000_lib = { .config_ap = iwl_config_ap, .temp_ops = { .temperature = iwlagn_temperature, - .set_ct_kill = iwl1000_set_ct_threshold, }, .manage_ibss_station = iwlagn_manage_ibss_station, .update_bcast_stations = iwl_update_bcast_stations, |