iwlwifi: remove auto_agg module parameter

If someone wants to disable AMPDU, there is the 11n_disable
module parameter.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c
index 94314a8e102940f0cb72249babde0f3f95a5e3c1..99d989a4510ba97508f80da2c7cbce115b4bdf29 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -419,23 +419,18 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
 
        load = rs_tl_get_load(lq_data, tid);
 
-       if ((iwlwifi_mod_params.auto_agg) || (load > IWL_AGG_LOAD_THRESHOLD)) {
-               IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
-                               sta->addr, tid);
-               ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
-               if (ret == -EAGAIN) {
-                       /*
-                        * driver and mac80211 is out of sync
-                        * this might be cause by reloading firmware
-                        * stop the tx ba session here
-                        */
-                       IWL_ERR(priv, "Fail start Tx agg on tid: %d\n",
-                               tid);
-                       ieee80211_stop_tx_ba_session(sta, tid);
-               }
-       } else {
-               IWL_DEBUG_HT(priv, "Aggregation not enabled for tid %d "
-                       "because load = %u\n", tid, load);
+       IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
+                       sta->addr, tid);
+       ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
+       if (ret == -EAGAIN) {
+               /*
+                * driver and mac80211 is out of sync
+                * this might be cause by reloading firmware
+                * stop the tx ba session here
+                */
+               IWL_ERR(priv, "Fail start Tx agg on tid: %d\n",
+                       tid);
+               ieee80211_stop_tx_ba_session(sta, tid);
        }
        return ret;
 }

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index b88bdec56bf017c23dffb89f9ab0f385c94e49bd..59b1e40f0507d3ae28b5d43f471293d5b65ba469 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1111,7 +1111,6 @@ struct iwl_mod_params iwlwifi_mod_params = {
        .restart_fw = true,
        .bt_coex_active = true,
        .power_level = IWL_POWER_INDEX_1,
-       .auto_agg = true,
        .wd_disable = true,
        /* the rest are 0 by default */
 };
@@ -1260,8 +1259,3 @@ module_param_named(power_level, iwlwifi_mod_params.power_level,
                int, S_IRUGO);
 MODULE_PARM_DESC(power_level,
                 "default power save level (range from 1 - 5, default: 1)");
-
-module_param_named(auto_agg, iwlwifi_mod_params.auto_agg,
-               bool, S_IRUGO);
-MODULE_PARM_DESC(auto_agg,
-                "enable agg w/o check traffic load (default: enable)");

diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h
index 367b6c18bba4da05cb44710c47fd2642175a7a6c..a1f580c0c6c6e9e80164421e157eb82b67fa007c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-modparams.h
+++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h
@@ -100,7 +100,6 @@ enum iwl_power_level {
  * @power_level: power level, default = 1
  * @debug_level: levels are IWL_DL_*
  * @ant_coupling: antenna coupling in dB, default = 0
- * @auto_agg: enable agg. without check, default = true
  */
 struct iwl_mod_params {
        int sw_crypto;
@@ -116,7 +115,6 @@ struct iwl_mod_params {
        u32 debug_level;
 #endif
        int ant_coupling;
-       bool auto_agg;
        char *nvm_file;
 };
 

diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index d6beec765d65727ca1d523a47221319e9759208e..d87876f5793f7710cee62a988c921465db404a4e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -412,24 +412,18 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_mvm *mvm,
                return ret;
        }
 
-       if ((iwlwifi_mod_params.auto_agg) || (load > IWL_AGG_LOAD_THRESHOLD)) {
-               IWL_DEBUG_HT(mvm, "Starting Tx agg: STA: %pM tid: %d\n",
-                            sta->addr, tid);
-               ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
-               if (ret == -EAGAIN) {
-                       /*
-                        * driver and mac80211 is out of sync
-                        * this might be cause by reloading firmware
-                        * stop the tx ba session here
-                        */
-                       IWL_ERR(mvm, "Fail start Tx agg on tid: %d\n",
-                               tid);
-                       ieee80211_stop_tx_ba_session(sta, tid);
-               }
-       } else {
-               IWL_DEBUG_HT(mvm,
-                            "Aggregation not enabled for tid %d because load = %u\n",
-                            tid, load);
+       IWL_DEBUG_HT(mvm, "Starting Tx agg: STA: %pM tid: %d\n",
+                    sta->addr, tid);
+       ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
+       if (ret == -EAGAIN) {
+               /*
+                * driver and mac80211 is out of sync
+                * this might be cause by reloading firmware
+                * stop the tx ba session here
+                */
+               IWL_ERR(mvm, "Fail start Tx agg on tid: %d\n",
+                       tid);
+               ieee80211_stop_tx_ba_session(sta, tid);
        }
        return ret;
 }