Commit 9bb3c01f authored by Andre Guedes's avatar Andre Guedes Committed by Johan Hedberg
Browse files

Bluetooth: Introduce le_conn_failed() helper 



This patch moves connection attempt failure code to its own function
so it can be reused in the next patch.

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

net/bluetooth/hci_conn.c

+16 −8
Original line number Diff line number Diff line
@@ -514,6 +514,21 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src) 
}

EXPORT_SYMBOL(hci_get_route);



/* This function requires the caller holds hdev->lock */

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

{

	struct hci_dev *hdev = conn->hdev;



	conn->state = BT_CLOSED;



	mgmt_connect_failed(hdev, &conn->dst, conn->type, conn->dst_type,

			    status);



	hci_proto_connect_cfm(conn, status);



	hci_conn_del(conn);

}



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

{

	struct hci_conn *conn;
@@ -530,14 +545,7 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status) 
	if (!conn)

		goto done;



	conn->state = BT_CLOSED;



	mgmt_connect_failed(hdev, &conn->dst, conn->type, conn->dst_type,

			    status);



	hci_proto_connect_cfm(conn, status);



	hci_conn_del(conn);

	le_conn_failed(conn, status);



done:

	hci_dev_unlock(hdev);