Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44cc429c authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: remove auto_agg module parameter



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

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8b5bf335
Loading
Loading
Loading
Loading
+12 −17
Original line number Diff line number Diff line
@@ -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);

	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);
@@ -433,10 +432,6 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
			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;
}

+0 −6
Original line number Diff line number Diff line
@@ -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)");
+0 −2
Original line number Diff line number Diff line
@@ -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;
};

+12 −18
Original line number Diff line number Diff line
@@ -412,7 +412,6 @@ 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);
@@ -426,11 +425,6 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_mvm *mvm,
			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;
}