iwlwifi: no need to refer to max_nrg_cck range value
max_nrg_cck value inside the sensitivity range structure is not needed for sensitivity calibration. Keep the parameter in sensitivity structure but set the value to "0" in case needed in the future implementation. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
9d67187dbd
commit
fe6efb4b42
3 changed files with 3 additions and 8 deletions
|
@ -728,7 +728,7 @@ static int iwl4965_alive_notify(struct iwl_priv *priv)
|
|||
|
||||
static struct iwl_sensitivity_ranges iwl4965_sensitivity = {
|
||||
.min_nrg_cck = 97,
|
||||
.max_nrg_cck = 0,
|
||||
.max_nrg_cck = 0, /* not used, set to 0 */
|
||||
|
||||
.auto_corr_min_ofdm = 85,
|
||||
.auto_corr_min_ofdm_mrc = 170,
|
||||
|
|
|
@ -388,7 +388,7 @@ void iwl5000_rts_tx_cmd_flag(struct ieee80211_tx_info *info,
|
|||
|
||||
static struct iwl_sensitivity_ranges iwl5000_sensitivity = {
|
||||
.min_nrg_cck = 95,
|
||||
.max_nrg_cck = 0,
|
||||
.max_nrg_cck = 0, /* not used, set to 0 */
|
||||
.auto_corr_min_ofdm = 90,
|
||||
.auto_corr_min_ofdm_mrc = 170,
|
||||
.auto_corr_min_ofdm_x1 = 120,
|
||||
|
|
|
@ -251,12 +251,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
|
|||
|
||||
/* increase energy threshold (reduce nrg value)
|
||||
* to decrease sensitivity */
|
||||
if (data->nrg_th_cck >
|
||||
(ranges->max_nrg_cck + NRG_STEP_CCK))
|
||||
data->nrg_th_cck = data->nrg_th_cck
|
||||
- NRG_STEP_CCK;
|
||||
else
|
||||
data->nrg_th_cck = ranges->max_nrg_cck;
|
||||
data->nrg_th_cck = data->nrg_th_cck - NRG_STEP_CCK;
|
||||
/* Else if we got fewer than desired, increase sensitivity */
|
||||
} else if (false_alarms < min_false_alarms) {
|
||||
data->nrg_curr_state = IWL_FA_TOO_FEW;
|
||||
|
|
Loading…
Reference in a new issue