summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-09-23 18:56:51 +0200
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-10-12 17:33:09 +0200
commita5901cbb5783b25fa71536503bfa4617d8ee41bd (patch)
tree41e5728f831f196b333700c07dbf5b88053b954f /drivers/net/wireless
parentiwlagn: add temperature offset calib for 6000g2 (diff)
downloadlinux-a5901cbb5783b25fa71536503bfa4617d8ee41bd.tar.xz
linux-a5901cbb5783b25fa71536503bfa4617d8ee41bd.zip
iiwlagn: always download priority table
For advance BT/WiFi co-exist, always download bt priority table before sending bt_config command Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c4fe3f94c366..4470e8c80e9f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2835,8 +2835,7 @@ static void iwl_alive_start(struct iwl_priv *priv)
priv->kill_cts_mask = IWLAGN_BT_KILL_CTS_MASK_DEFAULT;
priv->cfg->ops->hcmd->send_bt_config(priv);
priv->bt_valid = IWLAGN_BT_VALID_ENABLE_FLAGS;
- if (bt_coex_active && priv->iw_mode != NL80211_IFTYPE_ADHOC)
- iwlagn_send_prio_tbl(priv);
+ iwlagn_send_prio_tbl(priv);
/* FIXME: w/a to force change uCode BT state machine */
iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_OPEN,