aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-20 08:48:18 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-05-22 03:02:26 -0400
commit0f618e6ed012a5447c5128a899b54d011a480924 (patch)
tree16d08537678753a822f11a0331d333556945de5e /drivers
parentbca49d9a220b2f277f8e6000ac3a9d129d88972c (diff)
iwlwifi: mvm: disable reduced Tx power when not applicable
I forgot to disable the reduced Tx power in a few paths. Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/coex.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/coex.c b/drivers/net/wireless/iwlwifi/mvm/coex.c
index cbad3ef3de0e..e35f5a05cc68 100644
--- a/drivers/net/wireless/iwlwifi/mvm/coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/coex.c
@@ -831,8 +831,11 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,
831 iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_BT_COEX, 831 iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_BT_COEX,
832 smps_mode); 832 smps_mode);
833 data->reduced_tx_power = false; 833 data->reduced_tx_power = false;
834 if (vif->type == NL80211_IFTYPE_STATION) 834 if (vif->type == NL80211_IFTYPE_STATION) {
835 iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id,
836 false);
835 iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0); 837 iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0);
838 }
836 return; 839 return;
837 } 840 }
838 841
@@ -905,6 +908,7 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac,
905 mvm->cfg->bt_shared_single_ant || !vif->bss_conf.assoc || 908 mvm->cfg->bt_shared_single_ant || !vif->bss_conf.assoc ||
906 !data->notif->bt_status) { 909 !data->notif->bt_status) {
907 data->reduced_tx_power = false; 910 data->reduced_tx_power = false;
911 iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id, false);
908 iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0); 912 iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0);
909 return; 913 return;
910 } 914 }