hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emmanuel Grumbach 2013-06-18 06:33:49 +03:00 committed by Johannes Berg
parent 8b5bf33575
commit 44cc429cad
4 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/iwlwifi/dvm/rs.c
View File

@ -419,7 +419,6 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
load = rs_tl_get_load(lq_data, tid); 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", IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",
sta->addr, tid); sta->addr, tid);
ret = ieee80211_start_tx_ba_session(sta, tid, 5000); ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
@ -433,10 +432,6 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
tid); tid);
ieee80211_stop_tx_ba_session(sta, 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);
}
return ret; return ret;
} }

6
drivers/net/wireless/iwlwifi/iwl-drv.c
View File

@ -1111,7 +1111,6 @@ struct iwl_mod_params iwlwifi_mod_params = {
.restart_fw = true, .restart_fw = true,
.bt_coex_active = true, .bt_coex_active = true,
.power_level = IWL_POWER_INDEX_1, .power_level = IWL_POWER_INDEX_1,
.auto_agg = true,
.wd_disable = true, .wd_disable = true,
/* the rest are 0 by default */ /* the rest are 0 by default */
}; };
@ -1260,8 +1259,3 @@ module_param_named(power_level, iwlwifi_mod_params.power_level,
int, S_IRUGO); int, S_IRUGO);
MODULE_PARM_DESC(power_level, MODULE_PARM_DESC(power_level,
"default power save level (range from 1 - 5, default: 1)"); "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)");

2
drivers/net/wireless/iwlwifi/iwl-modparams.h
View File

@ -100,7 +100,6 @@ enum iwl_power_level {
* @power_level: power level, default = 1 * @power_level: power level, default = 1
* @debug_level: levels are IWL_DL_* * @debug_level: levels are IWL_DL_*
* @ant_coupling: antenna coupling in dB, default = 0 * @ant_coupling: antenna coupling in dB, default = 0
* @auto_agg: enable agg. without check, default = true
*/ */
struct iwl_mod_params { struct iwl_mod_params {
int sw_crypto; int sw_crypto;
@ -116,7 +115,6 @@ struct iwl_mod_params {
u32 debug_level; u32 debug_level;
#endif #endif
int ant_coupling; int ant_coupling;
bool auto_agg;
char *nvm_file; char *nvm_file;
}; };

6
drivers/net/wireless/iwlwifi/mvm/rs.c
View File

@ -412,7 +412,6 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_mvm *mvm,
return ret; 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", IWL_DEBUG_HT(mvm, "Starting Tx agg: STA: %pM tid: %d\n",
sta->addr, tid); sta->addr, tid);
ret = ieee80211_start_tx_ba_session(sta, tid, 5000); ret = ieee80211_start_tx_ba_session(sta, tid, 5000);
@ -426,11 +425,6 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_mvm *mvm,
tid); tid);
ieee80211_stop_tx_ba_session(sta, 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);
}
return ret; return ret;
} }