iwlagn: change default sensitivity value for 5000 and 6000 series

Update the default sensitivity value for both 5000 and 6000 series devices

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 4a8ff6fa9c2bf091c20cb1b4f440051bceecb856..a9adee5634d81c6d384a505b1d387e7a59917323 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -83,12 +83,12 @@ static void iwl5000_nic_config(struct iwl_priv *priv)
 }
 
 static struct iwl_sensitivity_ranges iwl5000_sensitivity = {
-       .min_nrg_cck = 95,
+       .min_nrg_cck = 100,
        .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,
-       .auto_corr_min_ofdm_mrc_x1 = 240,
+       .auto_corr_min_ofdm_x1 = 105,
+       .auto_corr_min_ofdm_mrc_x1 = 220,
 
        .auto_corr_max_ofdm = 120,
        .auto_corr_max_ofdm_mrc = 210,
@@ -97,10 +97,10 @@ static struct iwl_sensitivity_ranges iwl5000_sensitivity = {
 
        .auto_corr_min_cck = 125,
        .auto_corr_max_cck = 200,
-       .auto_corr_min_cck_mrc = 170,
+       .auto_corr_min_cck_mrc = 200,
        .auto_corr_max_cck_mrc = 400,
-       .nrg_th_cck = 95,
-       .nrg_th_ofdm = 95,
+       .nrg_th_cck = 100,
+       .nrg_th_ofdm = 100,
 
        .barker_corr_th_min = 190,
        .barker_corr_th_min_mrc = 390,

diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index b382a44c5bd53bc4a6bb7b60a407333a5b796971..339de88d9ae2ce5ba12a6d281ddf0d2514901240 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -113,7 +113,7 @@ static void iwl6000_nic_config(struct iwl_priv *priv)
 }
 
 static struct iwl_sensitivity_ranges iwl6000_sensitivity = {
-       .min_nrg_cck = 97,
+       .min_nrg_cck = 110,
        .max_nrg_cck = 0, /* not used, set to 0 */
        .auto_corr_min_ofdm = 80,
        .auto_corr_min_ofdm_mrc = 128,
@@ -129,11 +129,11 @@ static struct iwl_sensitivity_ranges iwl6000_sensitivity = {
        .auto_corr_max_cck = 175,
        .auto_corr_min_cck_mrc = 160,
        .auto_corr_max_cck_mrc = 310,
-       .nrg_th_cck = 97,
-       .nrg_th_ofdm = 100,
+       .nrg_th_cck = 110,
+       .nrg_th_ofdm = 110,
 
        .barker_corr_th_min = 190,
-       .barker_corr_th_min_mrc = 390,
+       .barker_corr_th_min_mrc = 336,
        .nrg_th_cca = 62,
 };