aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-08-23 10:57:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-25 14:34:52 -0400
commitfbba94104fb44d2f984e767cd8ac1edd80cb03d5 (patch)
tree6bb65b7ffb3ae8c8165efc11c593e094cb23a8c6 /drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
parent5d297d50653ba0c498e0b1e7b72b6611651357aa (diff)
iwlagn: parsing uart message and take actions
1. Based on uart message from uCode, re-configure BT kill ack mask messages from uCode 2. send REPLY_BT_COEX_SCO command to uCode based on the uart frame received from uCode Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-ucode.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-ucode.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
index 2dc569bc7e8f..771ceffb8f8b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
@@ -464,7 +464,12 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
464 if (priv->cfg->advanced_bt_coexist) { 464 if (priv->cfg->advanced_bt_coexist) {
465 /* Configure Bluetooth device coexistence support */ 465 /* Configure Bluetooth device coexistence support */
466 /* need to perform this before any calibration */ 466 /* need to perform this before any calibration */
467 priv->bt_valid = IWL6000G2B_BT_ALL_VALID_MSK;
468 priv->kill_ack_mask = IWL6000G2B_BT_KILL_ACK_MASK_DEFAULT;
469 priv->kill_cts_mask = IWL6000G2B_BT_KILL_CTS_MASK_DEFAULT;
467 priv->cfg->ops->hcmd->send_bt_config(priv); 470 priv->cfg->ops->hcmd->send_bt_config(priv);
471 priv->bt_valid = IWL6000G2B_BT_VALID_ENABLE_FLAGS;
472
468 if (bt_coex_active && priv->iw_mode != NL80211_IFTYPE_ADHOC) { 473 if (bt_coex_active && priv->iw_mode != NL80211_IFTYPE_ADHOC) {
469 iwlagn_send_prio_tbl(priv); 474 iwlagn_send_prio_tbl(priv);
470 iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_OPEN, 475 iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_OPEN,