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

Commit 2f69a82a authored by Frédéric Dalleau's avatar Frédéric Dalleau Committed by Gustavo Padovan
Browse files

Bluetooth: Use voice setting in deferred SCO connection request 



When an incoming eSCO connection is requested, check the selected voice
setting and reply appropriately. Voice setting should have been
negotiated previously.  For example, in case of HFP, the codec is
negotiated using AT commands on the RFCOMM channel. This patch only
changes replies for socket with deferred setup enabled.

Signed-off-by: default avatarFrédéric Dalleau <frederic.dalleau@linux.intel.com>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 5d4d62f6

net/bluetooth/sco.c

+17 −5
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
	return err;

}



static void sco_conn_defer_accept(struct hci_conn *conn)

static void sco_conn_defer_accept(struct hci_conn *conn, u16 setting)

{

	struct hci_dev *hdev = conn->hdev;
@@ -676,9 +676,21 @@ static void sco_conn_defer_accept(struct hci_conn *conn) 


		cp.tx_bandwidth   = __constant_cpu_to_le32(0x00001f40);

		cp.rx_bandwidth   = __constant_cpu_to_le32(0x00001f40);

		cp.content_format = cpu_to_le16(setting);



		switch (setting & SCO_AIRMODE_MASK) {

		case SCO_AIRMODE_TRANSP:

			if (conn->pkt_type & ESCO_2EV3)

				cp.max_latency = __constant_cpu_to_le16(0x0008);

			else

				cp.max_latency = __constant_cpu_to_le16(0x000D);

			cp.retrans_effort = 0x02;

			break;

		case SCO_AIRMODE_CVSD:

			cp.max_latency = __constant_cpu_to_le16(0xffff);

		cp.content_format = cpu_to_le16(hdev->voice_setting);

			cp.retrans_effort = 0xff;

			break;

		}



		hci_send_cmd(hdev, HCI_OP_ACCEPT_SYNC_CONN_REQ,

			     sizeof(cp), &cp);
@@ -695,7 +707,7 @@ static int sco_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 


	if (sk->sk_state == BT_CONNECT2 &&

	    test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) {

		sco_conn_defer_accept(pi->conn->hcon);

		sco_conn_defer_accept(pi->conn->hcon, pi->setting);

		sk->sk_state = BT_CONFIG;

		msg->msg_namelen = 0;