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

Commit 62547752 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Actively send request for Basic Mode 



The Profile Tuning Suite requires that we send a RFC containing the
Basic Mode configuration when requesting Basic Mode.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent ae12d52e

net/bluetooth/l2cap.c

+11 −6
Original line number Diff line number Diff line
@@ -2492,6 +2492,14 @@ static int l2cap_build_conf_req(struct sock *sk, void *data) 
	case L2CAP_MODE_BASIC:

		if (pi->imtu != L2CAP_DEFAULT_MTU)

			l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, pi->imtu);



		rfc.mode            = L2CAP_MODE_BASIC;

		rfc.txwin_size      = 0;

		rfc.max_transmit    = 0;

		rfc.retrans_timeout = 0;

		rfc.monitor_timeout = 0;

		rfc.max_pdu_size    = 0;



		break;



	case L2CAP_MODE_ERTM:
@@ -2504,9 +2512,6 @@ static int l2cap_build_conf_req(struct sock *sk, void *data) 
		if (L2CAP_DEFAULT_MAX_PDU_SIZE > pi->conn->mtu - 10)

			rfc.max_pdu_size = cpu_to_le16(pi->conn->mtu - 10);



		l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,

					sizeof(rfc), (unsigned long) &rfc);



		if (!(pi->conn->feat_mask & L2CAP_FEAT_FCS))

			break;
@@ -2527,9 +2532,6 @@ static int l2cap_build_conf_req(struct sock *sk, void *data) 
		if (L2CAP_DEFAULT_MAX_PDU_SIZE > pi->conn->mtu - 10)

			rfc.max_pdu_size = cpu_to_le16(pi->conn->mtu - 10);



		l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC,

					sizeof(rfc), (unsigned long) &rfc);



		if (!(pi->conn->feat_mask & L2CAP_FEAT_FCS))

			break;
@@ -2541,6 +2543,9 @@ static int l2cap_build_conf_req(struct sock *sk, void *data) 
		break;

	}



	l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),

						(unsigned long) &rfc);



	/* FIXME: Need actual value of the flush timeout */

	//if (flush_to != L2CAP_DEFAULT_FLUSH_TO)

	//   l2cap_add_conf_opt(&ptr, L2CAP_CONF_FLUSH_TO, 2, pi->flush_to);