Commit f00a06ac authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: Refactor hci_cs_le_create_conn 



This patch does some code refactoring in hci_cs_le_create_conn
function. The hci_conn object is only needed in case of failure,
therefore hdev locking and hci_conn lookup were moved to
if-statement scope.

Also, the conn->state check was removed since we should always
close the connection if it fails.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 847012c5

net/bluetooth/hci_event.c

+16 −14
Original line number Diff line number Diff line
@@ -1623,25 +1623,27 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) 
	if (!cp)

		return;



	if (status) {

		hci_dev_lock(hdev);



		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->peer_addr);

		if (!conn) {

			hci_dev_unlock(hdev);

			return;

		}



		BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&cp->peer_addr),

		       conn);



	if (status) {

		if (conn && conn->state == BT_CONNECT) {

		conn->state = BT_CLOSED;

		mgmt_connect_failed(hdev, &cp->peer_addr, conn->type,

				    conn->dst_type, status);

		hci_proto_connect_cfm(conn, status);

		hci_conn_del(conn);

		}

	}



		hci_dev_unlock(hdev);

	}

}



static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)

{