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

Commit 6f77d8c7 authored by Andre Guedes's avatar Andre Guedes Committed by Marcel Holtmann
Browse files

Bluetooth: Move address type conversion to outside hci_connect_le 



This patch moves address type conversion (L2CAP address type to HCI
address type) to outside hci_connect_le. This way, we avoid back and
forth address type conversion in a comming patch.

So hci_connect_le() now expects 'dst_type' parameter in HCI address
type convention.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 04a6c589

net/bluetooth/hci_conn.c

+0 −6
Original line number Diff line number Diff line
@@ -659,12 +659,6 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, 
	if (conn)

		return ERR_PTR(-EBUSY);



	/* Convert from L2CAP channel address type to HCI address type */

	if (dst_type == BDADDR_LE_PUBLIC)

		dst_type = ADDR_LE_DEV_PUBLIC;

	else

		dst_type = ADDR_LE_DEV_RANDOM;



	/* When given an identity address with existing identity

	 * resolving key, the connection needs to be established

	 * to a resolvable random address.

net/bluetooth/l2cap_core.c

+10 −2
Original line number Diff line number Diff line
@@ -7108,11 +7108,19 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 


	auth_type = l2cap_get_auth_type(chan);



	if (bdaddr_type_is_le(dst_type))

	if (bdaddr_type_is_le(dst_type)) {

		/* Convert from L2CAP channel address type to HCI address type

		 */

		if (dst_type == BDADDR_LE_PUBLIC)

			dst_type = ADDR_LE_DEV_PUBLIC;

		else

			dst_type = ADDR_LE_DEV_RANDOM;



		hcon = hci_connect_le(hdev, dst, dst_type, chan->sec_level,

				      auth_type);

	else

	} else {

		hcon = hci_connect_acl(hdev, dst, chan->sec_level, auth_type);

	}



	if (IS_ERR(hcon)) {

		err = PTR_ERR(hcon);

net/bluetooth/mgmt.c

+13 −3
Original line number Diff line number Diff line
@@ -2815,12 +2815,22 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
	else

		auth_type = HCI_AT_DEDICATED_BONDING_MITM;



	if (cp->addr.type == BDADDR_BREDR)

	if (cp->addr.type == BDADDR_BREDR) {

		conn = hci_connect_acl(hdev, &cp->addr.bdaddr, sec_level,

				       auth_type);

	} else {

		u8 addr_type;



		/* Convert from L2CAP channel address type to HCI address type

		 */

		if (cp->addr.type == BDADDR_LE_PUBLIC)

			addr_type = ADDR_LE_DEV_PUBLIC;

		else

		conn = hci_connect_le(hdev, &cp->addr.bdaddr, cp->addr.type,

			addr_type = ADDR_LE_DEV_RANDOM;



		conn = hci_connect_le(hdev, &cp->addr.bdaddr, addr_type,

				      sec_level, auth_type);

	}



	if (IS_ERR(conn)) {

		int status;