Commit 8b1c324c authored by Yu Liu's avatar Yu Liu Committed by Marcel Holtmann
Browse files

Bluetooth: Skip eSCO 2M params when not supported 



If a peer device doesn't support eSCO 2M we should skip the params that
use it when setting up sync connection since they will always fail.

Signed-off-by: default avatarYu Liu <yudiliu@google.com>
Reviewed-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b8ddc3b1

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -1365,6 +1365,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn); 
#define lmp_le_capable(dev)        ((dev)->features[0][4] & LMP_LE)

#define lmp_sniffsubr_capable(dev) ((dev)->features[0][5] & LMP_SNIFF_SUBR)

#define lmp_pause_enc_capable(dev) ((dev)->features[0][5] & LMP_PAUSE_ENC)

#define lmp_esco_2m_capable(dev)   ((dev)->features[0][5] & LMP_EDR_ESCO_2M)

#define lmp_ext_inq_capable(dev)   ((dev)->features[0][6] & LMP_EXT_INQ)

#define lmp_le_br_capable(dev)     (!!((dev)->features[0][6] & LMP_SIMUL_LE_BR))

#define lmp_ssp_capable(dev)       ((dev)->features[0][6] & LMP_SIMPLE_PAIR)

net/bluetooth/hci_conn.c

+18 −2
Original line number Diff line number Diff line
@@ -293,6 +293,20 @@ static void hci_add_sco(struct hci_conn *conn, __u16 handle) 
	hci_send_cmd(hdev, HCI_OP_ADD_SCO, sizeof(cp), &cp);

}



static bool find_next_esco_param(struct hci_conn *conn,

				 const struct sco_param *esco_param, int size)

{

	for (; conn->attempt <= size; conn->attempt++) {

		if (lmp_esco_2m_capable(conn->link) ||

		    (esco_param[conn->attempt - 1].pkt_type & ESCO_2EV3))

			break;

		BT_DBG("hcon %p skipped attempt %d, eSCO 2M not supported",

		       conn, conn->attempt);

	}



	return conn->attempt <= size;

}



bool hci_setup_sync(struct hci_conn *conn, __u16 handle)

{

	struct hci_dev *hdev = conn->hdev;
@@ -314,13 +328,15 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle) 


	switch (conn->setting & SCO_AIRMODE_MASK) {

	case SCO_AIRMODE_TRANSP:

		if (conn->attempt > ARRAY_SIZE(esco_param_msbc))

		if (!find_next_esco_param(conn, esco_param_msbc,

					  ARRAY_SIZE(esco_param_msbc)))

			return false;

		param = &esco_param_msbc[conn->attempt - 1];

		break;

	case SCO_AIRMODE_CVSD:

		if (lmp_esco_capable(conn->link)) {

			if (conn->attempt > ARRAY_SIZE(esco_param_cvsd))

			if (!find_next_esco_param(conn, esco_param_cvsd,

						  ARRAY_SIZE(esco_param_cvsd)))

				return false;

			param = &esco_param_cvsd[conn->attempt - 1];

		} else {