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:14 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-25 14:34:53 -0400
commitb6e116e8bf7d749b0743c167bd47930c22c77a82 (patch)
treed64302d6a6785f3bf0301ad7c8d41b670cf74147 /drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
parentda5dbb971573efda54c7c39e7e4ccd3fc7c86e49 (diff)
iwlagn: generic bt coex functions
Move bt coex functions to iwl-agn-lib.c, so those functions can be shared by multiple wifi/bt combo devices 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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
index 771ceffb8f8..f2499e1f204 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
@@ -464,11 +464,11 @@ 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; 467 priv->bt_valid = IWLAGN_BT_ALL_VALID_MSK;
468 priv->kill_ack_mask = IWL6000G2B_BT_KILL_ACK_MASK_DEFAULT; 468 priv->kill_ack_mask = IWLAGN_BT_KILL_ACK_MASK_DEFAULT;
469 priv->kill_cts_mask = IWL6000G2B_BT_KILL_CTS_MASK_DEFAULT; 469 priv->kill_cts_mask = IWLAGN_BT_KILL_CTS_MASK_DEFAULT;
470 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; 471 priv->bt_valid = IWLAGN_BT_VALID_ENABLE_FLAGS;
472 472
473 if (bt_coex_active && priv->iw_mode != NL80211_IFTYPE_ADHOC) { 473 if (bt_coex_active && priv->iw_mode != NL80211_IFTYPE_ADHOC) {
474 iwlagn_send_prio_tbl(priv); 474 iwlagn_send_prio_tbl(priv);