3 files changed, 3 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 8f3d4bc6a03f..edbb0bfd8cb7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -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,
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 0e445a9c6929..85e8bac499a7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -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,
diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c
index a5d63672ad39..f8bf592e939c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-calib.c
@@ -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;