aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorGravatar Emmanuel Grumbach <emmanuel.grumbach@intel.com> 2014-01-28 12:27:31 +0200
committerGravatar Emmanuel Grumbach <emmanuel.grumbach@intel.com> 2014-02-02 11:08:10 +0200
commit8e2a866ef214af4e104ec8d593e3269d8fe66d19 (patch)
tree29b240b2eff1d452bf7d00e336b46975204f6953 /drivers/net/wireless
parentiwlwifi: mvm: don't leak a station when we drain (diff)
downloadlinux-8e2a866ef214af4e104ec8d593e3269d8fe66d19.tar.gz
linux-8e2a866ef214af4e104ec8d593e3269d8fe66d19.tar.bz2
linux-8e2a866ef214af4e104ec8d593e3269d8fe66d19.zip
iwlwifi: mvm: BT Coex - disable BT when TXing probe request in scan
Not doing so will let BT kill our probe requests leading to failures in scan. Cc: <stable@vger.kernel.org> [3.10+] Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index c35f35cc4391..742afc429c94 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -344,7 +344,8 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,
iwl_mvm_scan_fill_ssids(cmd, req, basic_ssid ? 1 : 0);
- cmd->tx_cmd.tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL);
+ cmd->tx_cmd.tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL |
+ TX_CMD_FLG_BT_DIS);
cmd->tx_cmd.sta_id = mvm->aux_sta.sta_id;
cmd->tx_cmd.life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
cmd->tx_cmd.rate_n_flags =