Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18bc6996 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: mvm: BT Coex - no need to send envelopes 



This was due to a fw remainder of old implementation.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent dac94da8

drivers/net/wireless/iwlwifi/mvm/bt-coex.c

+0 −25
Original line number Diff line number Diff line
@@ -120,20 +120,6 @@ int iwl_send_bt_prio_tbl(struct iwl_mvm *mvm) 
				    &iwl_bt_prio_tbl);

}



static int iwl_send_bt_env(struct iwl_mvm *mvm, u8 action, u8 type)

{

	struct iwl_bt_coex_prot_env_cmd env_cmd;

	int ret;



	env_cmd.action = action;

	env_cmd.type = type;

	ret = iwl_mvm_send_cmd_pdu(mvm, BT_COEX_PROT_ENV, CMD_SYNC,

				   sizeof(env_cmd), &env_cmd);

	if (ret)

		IWL_ERR(mvm, "failed to send BT env command\n");

	return ret;

}



enum iwl_bt_kill_msk {

	BT_KILL_MSK_DEFAULT,

	BT_KILL_MSK_SCO_HID_A2DP,
@@ -304,17 +290,6 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 
	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NEWBT_COEX))

		return 0;



	/* go to CALIB state in internal BT-Coex state machine */

	ret = iwl_send_bt_env(mvm, BT_COEX_ENV_OPEN,

			      BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);

	if (ret)

		return ret;



	ret  = iwl_send_bt_env(mvm, BT_COEX_ENV_CLOSE,

			       BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);

	if (ret)

		return ret;



	bt_cmd = kzalloc(sizeof(*bt_cmd), GFP_KERNEL);

	if (!bt_cmd)

		return -ENOMEM;

drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h

+0 −16
Original line number Diff line number Diff line
@@ -353,20 +353,4 @@ struct iwl_bt_coex_prio_tbl_cmd { 
	u8 prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX];

} __packed;



enum iwl_bt_coex_env_action {

	BT_COEX_ENV_CLOSE	 = 0,

	BT_COEX_ENV_OPEN	 = 1,

}; /* BT_COEX_PROT_ENV_ACTION_API_E_VER_1 */



/**

 * struct iwl_bt_coex_prot_env_cmd - BT Protection Envelope

 * @action: enum %iwl_bt_coex_env_action

 * @type: enum %iwl_bt_coex_prio_table_event

 */

struct iwl_bt_coex_prot_env_cmd {

	u8 action; /* 0 = closed, 1 = open */

	u8 type; /* 0 .. 15 */

	u8 reserved[2];

} __packed;



#endif /* __fw_api_bt_coex_h__ */