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

Commit 4c47d739 authored by Vishal Agarwal's avatar Vishal Agarwal Committed by Gustavo Padovan
Browse files

Bluetooth: Fix LE pairing completion on connection failure 



For BR/EDR pairing is assumed to be finished when connection is
done. For LE if connection is successful it did not necessarily
mean that pairing is also done but if the connection is unsuccessful
it should be assumed that pairing procedure is also finished.
This patch registers a new function with connect_cfm_cb callback for
LE link which sends the pairing complete signal to user space if
connection is unsuccessful.

Signed-off-by: default avatarVishal Agarwal <vishal.agarwal@stericsson.com>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 476585ec

net/bluetooth/mgmt.c

+18 −0
Original line number Diff line number Diff line
@@ -1873,6 +1873,22 @@ static void pairing_complete_cb(struct hci_conn *conn, u8 status) 
		pairing_complete(cmd, mgmt_status(status));

}



static void le_connect_complete_cb(struct hci_conn *conn, u8 status)

{

	struct pending_cmd *cmd;



	BT_DBG("status %u", status);



	if (!status)

		return;



	cmd = find_pairing(conn);

	if (!cmd)

		BT_DBG("Unable to find a pending command");

	else

		pairing_complete(cmd, mgmt_status(status));

}



static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,

		       u16 len)

{
@@ -1934,6 +1950,8 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
	/* For LE, just connecting isn't a proof that the pairing finished */

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

		conn->connect_cfm_cb = pairing_complete_cb;

	else

		conn->connect_cfm_cb = le_connect_complete_cb;



	conn->security_cfm_cb = pairing_complete_cb;

	conn->disconn_cfm_cb = pairing_complete_cb;