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

Bluetooth: Refactor in hci_le_conn_complete_evt 



This patch moves the hci_conn check to begining of hci_le_conn_
complete_evt in order to improve code's readability and better
error handling.

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

net/bluetooth/hci_event.c

+9 −13
Original line number Diff line number Diff line
@@ -3334,19 +3334,6 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	hci_dev_lock(hdev);



	conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);



	if (ev->status) {

		if (!conn)

			goto unlock;



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

				    conn->dst_type, ev->status);

		hci_proto_connect_cfm(conn, ev->status);

		conn->state = BT_CLOSED;

		hci_conn_del(conn);

		goto unlock;

	}



	if (!conn) {

		conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr);

		if (!conn) {
@@ -3362,6 +3349,15 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		}

	}



	if (ev->status) {

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

				    conn->dst_type, ev->status);

		hci_proto_connect_cfm(conn, ev->status);

		conn->state = BT_CLOSED;

		hci_conn_del(conn);

		goto unlock;

	}



	if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))

		mgmt_device_connected(hdev, &ev->bdaddr, conn->type,

				      conn->dst_type, 0, NULL, 0, NULL);