aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.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.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.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 4410f820c2f3..5e0d0d527bf0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4024,9 +4024,9 @@ static int iwl_init_drv(struct iwl_priv *priv)
4024 4024
4025 /* init bt coex */ 4025 /* init bt coex */
4026 if (priv->cfg->advanced_bt_coexist) { 4026 if (priv->cfg->advanced_bt_coexist) {
4027 priv->kill_ack_mask = IWL6000G2B_BT_KILL_ACK_MASK_DEFAULT; 4027 priv->kill_ack_mask = IWLAGN_BT_KILL_ACK_MASK_DEFAULT;
4028 priv->kill_cts_mask = IWL6000G2B_BT_KILL_CTS_MASK_DEFAULT; 4028 priv->kill_cts_mask = IWLAGN_BT_KILL_CTS_MASK_DEFAULT;
4029 priv->bt_valid = IWL6000G2B_BT_ALL_VALID_MSK; 4029 priv->bt_valid = IWLAGN_BT_ALL_VALID_MSK;
4030 priv->bt_on_thresh = BT_ON_THRESHOLD_DEF; 4030 priv->bt_on_thresh = BT_ON_THRESHOLD_DEF;
4031 priv->bt_duration = BT_DURATION_LIMIT_DEF; 4031 priv->bt_duration = BT_DURATION_LIMIT_DEF;
4032 priv->dynamic_frag_thresh = BT_FRAG_THRESHOLD_DEF; 4032 priv->dynamic_frag_thresh = BT_FRAG_THRESHOLD_DEF;