openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Andre Guedes 2013-11-07 17:36:10 -03:00 committed by Gustavo Padovan
parent abf54a506d
commit 3846220b0d
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
net/bluetooth/hci_event.c
View File

@ -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; struct hci_ev_disconn_complete *ev = (void *) skb->data;
u8 reason = hci_to_mgmt_reason(ev->reason); u8 reason = hci_to_mgmt_reason(ev->reason);
struct hci_conn *conn; struct hci_conn *conn;
u8 type;
BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
@ -1790,40 +1791,38 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
if (!conn) if (!conn)
goto unlock; goto unlock;
if (ev->status == 0)
conn->state = BT_CLOSED;
if (ev->status) { if (ev->status) {
mgmt_disconnect_failed(hdev, &conn->dst, conn->type, mgmt_disconnect_failed(hdev, &conn->dst, conn->type,
conn->dst_type, ev->status); conn->dst_type, ev->status);
goto unlock; goto unlock;
} }
conn->state = BT_CLOSED;
if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
mgmt_device_disconnected(hdev, &conn->dst, conn->type, mgmt_device_disconnected(hdev, &conn->dst, conn->type,
conn->dst_type, reason); conn->dst_type, reason);
if (ev->status == 0) { if (conn->type == ACL_LINK && conn->flush_key)
u8 type = conn->type; hci_remove_link_key(hdev, &conn->dst);
if (type == ACL_LINK && conn->flush_key) type = conn->type;
hci_remove_link_key(hdev, &conn->dst);
hci_proto_disconn_cfm(conn, ev->reason);
hci_conn_del(conn);
/* Re-enable advertising if necessary, since it might hci_proto_disconn_cfm(conn, ev->reason);
* have been disabled by the connection. From the hci_conn_del(conn);
* HCI_LE_Set_Advertise_Enable command description in
* the core specification (v4.0): /* Re-enable advertising if necessary, since it might
* "The Controller shall continue advertising until the Host * have been disabled by the connection. From the
* issues an LE_Set_Advertise_Enable command with * HCI_LE_Set_Advertise_Enable command description in
* Advertising_Enable set to 0x00 (Advertising is disabled) * the core specification (v4.0):
* or until a connection is created or until the Advertising * "The Controller shall continue advertising until the Host
* is timed out due to Directed Advertising." * issues an LE_Set_Advertise_Enable command with
*/ * Advertising_Enable set to 0x00 (Advertising is disabled)
if (type == LE_LINK) * or until a connection is created or until the Advertising
mgmt_reenable_advertising(hdev); * is timed out due to Directed Advertising."
} */
if (type == LE_LINK)
mgmt_reenable_advertising(hdev);
unlock: unlock:
hci_dev_unlock(hdev); hci_dev_unlock(hdev);