iwlwifi: remove plcp_check module parameter
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 18 Jun 2013 03:31:37 +0000 (06:31 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 18 Jun 2013 09:51:56 +0000 (11:51 +0200)
Nobody will ever wants to run without this. Make it true always.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/iwlwifi/dvm/rx.c
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/iwl-modparams.h

index 2f3fd160ab449c36e06d3172d08a253809ce41e8..5d31a1a15849f713a05676d3c8055eb68d22876b 100644 (file)
@@ -335,8 +335,7 @@ static void iwlagn_recover_from_statistics(struct iwl_priv *priv,
        if (msecs < 99)
                return;
 
-       if (iwlwifi_mod_params.plcp_check &&
-           !iwlagn_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs))
+       if (!iwlagn_good_plcp_health(priv, cur_ofdm, cur_ofdm_ht, msecs))
                iwl_force_rf_reset(priv, false);
 }
 
index 01b9763f73149582c9633b5dc54b82668e083c3b..b88bdec56bf017c23dffb89f9ab0f385c94e49bd 100644 (file)
@@ -1109,7 +1109,6 @@ void iwl_drv_stop(struct iwl_drv *drv)
 /* shared module parameters */
 struct iwl_mod_params iwlwifi_mod_params = {
        .restart_fw = true,
-       .plcp_check = true,
        .bt_coex_active = true,
        .power_level = IWL_POWER_INDEX_1,
        .auto_agg = true,
@@ -1220,9 +1219,6 @@ module_param_named(antenna_coupling, iwlwifi_mod_params.ant_coupling,
 MODULE_PARM_DESC(antenna_coupling,
                 "specify antenna coupling in dB (defualt: 0 dB)");
 
-module_param_named(plcp_check, iwlwifi_mod_params.plcp_check, bool, S_IRUGO);
-MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");
-
 module_param_named(wd_disable, iwlwifi_mod_params.wd_disable, int, S_IRUGO);
 MODULE_PARM_DESC(wd_disable,
                "Disable stuck queue watchdog timer 0=system default, "
index e2e64924c90d2a8637b003ea2f96cf4f896077c8..367b6c18bba4da05cb44710c47fd2642175a7a6c 100644 (file)
@@ -93,7 +93,6 @@ enum iwl_power_level {
  *     use IWL_DISABLE_HT_* constants
  * @amsdu_size_8K: enable 8K amsdu size, default = 0
  * @restart_fw: restart firmware, default = 1
- * @plcp_check: enable plcp health check, default = true
  * @wd_disable: enable stuck queue check, default = 0
  * @bt_coex_active: enable bt coex, default = true
  * @led_mode: system default, default = 0
@@ -108,7 +107,6 @@ struct iwl_mod_params {
        unsigned int disable_11n;
        int amsdu_size_8K;
        bool restart_fw;
-       bool plcp_check;
        int  wd_disable;
        bool bt_coex_active;
        int led_mode;