aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 4bc82fcf1652..3dee87e8f55d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1492,15 +1492,11 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
1492 if (priv->cfg->scan_rx_antennas[band]) 1492 if (priv->cfg->scan_rx_antennas[band])
1493 rx_ant = priv->cfg->scan_rx_antennas[band]; 1493 rx_ant = priv->cfg->scan_rx_antennas[band];
1494 1494
1495 if (priv->cfg->scan_tx_antennas[band]) 1495 if (band == IEEE80211_BAND_2GHZ &&
1496 scan_tx_antennas = priv->cfg->scan_tx_antennas[band]; 1496 priv->cfg->bt_params &&
1497 1497 priv->cfg->bt_params->advanced_bt_coexist) {
1498 if (priv->cfg->bt_params && 1498 /* transmit 2.4 GHz probes only on first antenna */
1499 priv->cfg->bt_params->advanced_bt_coexist && 1499 scan_tx_antennas = first_antenna(scan_tx_antennas);
1500 priv->bt_full_concurrent) {
1501 /* operated as 1x1 in full concurrency mode */
1502 scan_tx_antennas = first_antenna(
1503 priv->cfg->scan_tx_antennas[band]);
1504 } 1500 }
1505 1501
1506 priv->scan_tx_ant[band] = iwl_toggle_tx_ant(priv, priv->scan_tx_ant[band], 1502 priv->scan_tx_ant[band] = iwl_toggle_tx_ant(priv, priv->scan_tx_ant[band],