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

Commit 0ad06aa6 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Fix specifying role for LE connections 



The hci_connect_le_scan() is (as the name implies) a master/central
role API, so it makes no sense in passing a role parameter to it. At
the same time this patch also fixes the direct advertising support for
LE L2CAP sockets where we now call the more appropriate hci_le_connect()
API if slave/peripheral role is desired.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 3dfe5905

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle); 


struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst,

				     u8 dst_type, u8 sec_level,

				     u16 conn_timeout, u8 role);

				     u16 conn_timeout);

struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,

				u8 dst_type, u8 sec_level, u16 conn_timeout,

				u8 role);

net/bluetooth/hci_conn.c

+2 −2
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ static int hci_explicit_conn_params_set(struct hci_dev *hdev, 
/* This function requires the caller holds hdev->lock */

struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst,

				     u8 dst_type, u8 sec_level,

				     u16 conn_timeout, u8 role)

				     u16 conn_timeout)

{

	struct hci_conn *conn;
@@ -1018,7 +1018,7 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst, 


	BT_DBG("requesting refresh of dst_addr");



	conn = hci_conn_add(hdev, LE_LINK, dst, role);

	conn = hci_conn_add(hdev, LE_LINK, dst, HCI_ROLE_MASTER);

	if (!conn)

		return ERR_PTR(-ENOMEM);

net/bluetooth/l2cap_core.c

+7 −8
Original line number Diff line number Diff line
@@ -7113,8 +7113,6 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
	chan->dcid = cid;



	if (bdaddr_type_is_le(dst_type)) {

		u8 role;



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

		 */

		if (dst_type == BDADDR_LE_PUBLIC)
@@ -7123,14 +7121,15 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
			dst_type = ADDR_LE_DEV_RANDOM;



		if (hci_dev_test_flag(hdev, HCI_ADVERTISING))

			role = HCI_ROLE_SLAVE;

			hcon = hci_connect_le(hdev, dst, dst_type,

					      chan->sec_level,

					      HCI_LE_CONN_TIMEOUT,

					      HCI_ROLE_SLAVE);

		else

			role = HCI_ROLE_MASTER;



			hcon = hci_connect_le_scan(hdev, dst, dst_type,

						   chan->sec_level,

					   HCI_LE_CONN_TIMEOUT,

					   role);

						   HCI_LE_CONN_TIMEOUT);



	} else {

		u8 auth_type = l2cap_get_auth_type(chan);

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

net/bluetooth/mgmt.c

+1 −2
Original line number Diff line number Diff line
@@ -3518,8 +3518,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 


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

					   addr_type, sec_level,

					   HCI_LE_CONN_TIMEOUT,

					   HCI_ROLE_MASTER);

					   HCI_LE_CONN_TIMEOUT);

	}



	if (IS_ERR(conn)) {