aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-06-25 08:42:03 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-10-02 12:00:40 -0400
commit18bc6996c74ba475061fd1532e4a9f4409c8bc63 (patch)
tree09d2312b14540f988063a5adcfa375f2dcd50076 /drivers/net/wireless/iwlwifi/mvm
parentdac94da8dba3855aa97a376bed223c342981e236 (diff)
iwlwifi: mvm: BT Coex - no need to send envelopes
This was due to a fw remainder of old implementation. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/bt-coex.c25
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h16
2 files changed, 0 insertions, 41 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
index 55d1a6c469ee..1990fde92d64 100644
--- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c
@@ -120,20 +120,6 @@ int iwl_send_bt_prio_tbl(struct iwl_mvm *mvm)
120 &iwl_bt_prio_tbl); 120 &iwl_bt_prio_tbl);
121} 121}
122 122
123static int iwl_send_bt_env(struct iwl_mvm *mvm, u8 action, u8 type)
124{
125 struct iwl_bt_coex_prot_env_cmd env_cmd;
126 int ret;
127
128 env_cmd.action = action;
129 env_cmd.type = type;
130 ret = iwl_mvm_send_cmd_pdu(mvm, BT_COEX_PROT_ENV, CMD_SYNC,
131 sizeof(env_cmd), &env_cmd);
132 if (ret)
133 IWL_ERR(mvm, "failed to send BT env command\n");
134 return ret;
135}
136
137enum iwl_bt_kill_msk { 123enum iwl_bt_kill_msk {
138 BT_KILL_MSK_DEFAULT, 124 BT_KILL_MSK_DEFAULT,
139 BT_KILL_MSK_SCO_HID_A2DP, 125 BT_KILL_MSK_SCO_HID_A2DP,
@@ -304,17 +290,6 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
304 if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NEWBT_COEX)) 290 if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NEWBT_COEX))
305 return 0; 291 return 0;
306 292
307 /* go to CALIB state in internal BT-Coex state machine */
308 ret = iwl_send_bt_env(mvm, BT_COEX_ENV_OPEN,
309 BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
310 if (ret)
311 return ret;
312
313 ret = iwl_send_bt_env(mvm, BT_COEX_ENV_CLOSE,
314 BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
315 if (ret)
316 return ret;
317
318 bt_cmd = kzalloc(sizeof(*bt_cmd), GFP_KERNEL); 293 bt_cmd = kzalloc(sizeof(*bt_cmd), GFP_KERNEL);
319 if (!bt_cmd) 294 if (!bt_cmd)
320 return -ENOMEM; 295 return -ENOMEM;
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
index a470ea0db29e..acb32f4b3dd4 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h
@@ -353,20 +353,4 @@ struct iwl_bt_coex_prio_tbl_cmd {
353 u8 prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX]; 353 u8 prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX];
354} __packed; 354} __packed;
355 355
356enum iwl_bt_coex_env_action {
357 BT_COEX_ENV_CLOSE = 0,
358 BT_COEX_ENV_OPEN = 1,
359}; /* BT_COEX_PROT_ENV_ACTION_API_E_VER_1 */
360
361/**
362 * struct iwl_bt_coex_prot_env_cmd - BT Protection Envelope
363 * @action: enum %iwl_bt_coex_env_action
364 * @type: enum %iwl_bt_coex_prio_table_event
365 */
366struct iwl_bt_coex_prot_env_cmd {
367 u8 action; /* 0 = closed, 1 = open */
368 u8 type; /* 0 .. 15 */
369 u8 reserved[2];
370} __packed;
371
372#endif /* __fw_api_bt_coex_h__ */ 356#endif /* __fw_api_bt_coex_h__ */