Commit fa142220 authored Aug 07, 2015 by Jakub Pawlowski Committed by Marcel Holtmann Aug 10, 2015

Bluetooth: Enable new connection establishment procedure.

Currently, when trying to connect to already paired device that just
rotated its RPA MAC address, old address would be used and connection
would fail. In order to fix that, kernel must scan and receive
advertisement with fresh RPA before connecting.

This patch enables new connection establishment procedure. Instead of just
sending HCI_OP_LE_CREATE_CONN to controller, "connect" will add device to
kernel whitelist and start scan. If advertisement is received, it'll be
compared against whitelist and then trigger connection if it matches.
That fixes mentioned reconnect issue for already paired devices. It also
make whole connection procedure more robust. We can try to connect to
multiple devices at same time now, even though controller allow only one.

Signed-off-by: Jakub Pawlowski <jpawlowski@google.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent cc2b6911

net/bluetooth/l2cap_core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -7113,8 +7113,10 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
		else
		role = HCI_ROLE_MASTER;

		hcon = hci_connect_le(hdev, dst, dst_type, chan->sec_level,
		HCI_LE_CONN_TIMEOUT, role);
		hcon = hci_connect_le_scan(hdev, dst, dst_type,
		chan->sec_level,
		HCI_LE_CONN_TIMEOUT,
		role);
		} else {
		u8 auth_type = l2cap_get_auth_type(chan);
		hcon = hci_connect_acl(hdev, dst, chan->sec_level, auth_type);

net/bluetooth/mgmt.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -3564,8 +3564,9 @@ static int pair_device(struct sock sk, struct hci_dev hdev, void *data,
		*/
		hci_conn_params_add(hdev, &cp->addr.bdaddr, addr_type);

		conn = hci_connect_le(hdev, &cp->addr.bdaddr, addr_type,
		sec_level, HCI_LE_CONN_TIMEOUT,
		conn = hci_connect_le_scan(hdev, &cp->addr.bdaddr,
		addr_type, sec_level,
		HCI_LE_CONN_TIMEOUT,
		HCI_ROLE_MASTER);
		}