openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: mvm: rs: don't allow TPC when power save is disabled 

Currently we were checking only if the driver power_scheme is set
to CAM. TPC shouldn't be enabled also when disabling powersave on the
interface (e.g. iw wlan0 set power_save off)
which may occur even if power_scheme wasn't set to CAM.

Signed-off-by: Eyal Shapira <eyalx.shapira@intel.com>
Reviewed-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Eyal Shapira 2014-04-21 21:33:17 +03:00 committed by Emmanuel Grumbach
parent 80763515c3
commit 1e9551deba
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1750,16 +1750,21 @@ static void rs_get_adjacent_txp(struct iwl_mvm *mvm, int index,
*stronger = TPC_INVALID; *stronger = TPC_INVALID;
} }
static bool rs_tpc_allowed(struct iwl_mvm *mvm, struct rs_rate *rate, static bool rs_tpc_allowed(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
enum ieee80211_band band) struct rs_rate *rate, enum ieee80211_band band)
{ {
int index = rate->index; int index = rate->index;
bool cam = (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM);
bool sta_ps_disabled = (vif->type == NL80211_IFTYPE_STATION &&
!vif->bss_conf.ps);
IWL_DEBUG_RATE(mvm, "cam: %d sta_ps_disabled %d\n",
cam, sta_ps_disabled);
/* /*
* allow tpc only if power management is enabled, or bt coex * allow tpc only if power management is enabled, or bt coex
* activity grade allows it and we are on 2.4Ghz. * activity grade allows it and we are on 2.4Ghz.
*/ */
if (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM && if ((cam || sta_ps_disabled) &&
!iwl_mvm_bt_coex_is_tpc_allowed(mvm, band)) !iwl_mvm_bt_coex_is_tpc_allowed(mvm, band))
return false; return false;
@ -1876,7 +1881,7 @@ static bool rs_tpc_perform(struct iwl_mvm *mvm,
band = chanctx_conf->def.chan->band; band = chanctx_conf->def.chan->band;
rcu_read_unlock(); rcu_read_unlock();
if (!rs_tpc_allowed(mvm, rate, band)) { if (!rs_tpc_allowed(mvm, vif, rate, band)) {
IWL_DEBUG_RATE(mvm, IWL_DEBUG_RATE(mvm,
"tpc is not allowed. remove txp restrictions"); "tpc is not allowed. remove txp restrictions");
lq_sta->lq.reduced_tpc = TPC_NO_REDUCTION; lq_sta->lq.reduced_tpc = TPC_NO_REDUCTION;