From 85d948e6045e7c8b5ca6bda35cec5a273e1c9dc1 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Thu, 25 Aug 2011 23:10:55 -0700 Subject: [PATCH] --- yaml --- r: 265852 b: refs/heads/master c: dd5b6d0a2059027366028630746d951b1e1e24b3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 5 +++++ trunk/drivers/net/wireless/iwlwifi/iwl-shared.h | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0fb418076809..9839a1ded970 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ff94706a055f3e21710b08ffbe3979d7db615db +refs/heads/master: dd5b6d0a2059027366028630746d951b1e1e24b3 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 82fb55bc0b28..6cfd23620973 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-lib.c @@ -612,6 +612,7 @@ struct iwl_mod_params iwlagn_mod_params = { .power_level = IWL_POWER_INDEX_1, .bt_ch_announce = 1, .wanted_ucode_alternative = 1, + .auto_agg = true, /* the rest are 0 by default */ }; diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index cff6442ab0c0..3870b723c8c2 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rs.c @@ -420,7 +420,7 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, load = rs_tl_get_load(lq_data, tid); - if (load > IWL_AGG_LOAD_THRESHOLD) { + if ((iwlagn_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); diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index f6884a54b7f8..be2ba4ddb92c 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3588,6 +3588,11 @@ module_param_named(power_level, iwlagn_mod_params.power_level, MODULE_PARM_DESC(power_level, "default power save level (range from 1 - 5, default: 1)"); +module_param_named(auto_agg, iwlagn_mod_params.auto_agg, + bool, S_IRUGO); +MODULE_PARM_DESC(auto_agg, + "enable agg w/o check traffic load (default: enable)"); + /* * For now, keep using power level 1 instead of automatically * adjusting ... diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h index a5ef79bb275a..ec71ec7e1fc4 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -93,6 +93,7 @@ struct iwl_mod_params { int ant_coupling; bool bt_ch_announce; int wanted_ucode_alternative; + bool auto_agg; /* def: true = enable agg. without check */ }; /**