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

Bluetooth: Refactor hci_disconn_complete_evt 



hci_disconn_complete_evt() logic is more complicated than what it
should be, making it hard to follow and add new features.

So this patch does some code refactoring by handling the error cases
in the beginning of the function and by moving the main flow into the
first level of function scope. No change is done in the event handling
logic itself.

Besides organizing this messy code, this patch makes easier to add
code for handling LE auto connection (which will be added in a further
patch).

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent abf54a50

net/bluetooth/hci_event.c

+21 −22
Original line number Diff line number Diff line
@@ -1781,6 +1781,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	struct hci_ev_disconn_complete *ev = (void *) skb->data;

	u8 reason = hci_to_mgmt_reason(ev->reason);

	struct hci_conn *conn;

	u8 type;



	BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
@@ -1790,24 +1791,23 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	if (!conn)

		goto unlock;



	if (ev->status == 0)

		conn->state = BT_CLOSED;



	if (ev->status) {

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

				       conn->dst_type, ev->status);

		goto unlock;

	}



	conn->state = BT_CLOSED;



	if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))

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

					 conn->dst_type, reason);



	if (ev->status == 0) {

		u8 type = conn->type;



		if (type == ACL_LINK && conn->flush_key)

	if (conn->type == ACL_LINK && conn->flush_key)

		hci_remove_link_key(hdev, &conn->dst);



	type = conn->type;



	hci_proto_disconn_cfm(conn, ev->reason);

	hci_conn_del(conn);
@@ -1823,7 +1823,6 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	 */

	if (type == LE_LINK)

		mgmt_reenable_advertising(hdev);

	}



unlock:

	hci_dev_unlock(hdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE