Bluetooth: Remove link type check in hci_disconn_complete_evt()
authorAndre Guedes <andre.guedes@openbossa.org>
Wed, 30 Oct 2013 22:01:42 +0000 (19:01 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Wed, 4 Dec 2013 13:09:04 +0000 (11:09 -0200)
We can safely remove the link type check from hci_disconn_complete_
evt() since this check in not required for mgmt_disconnect_failed()
and mgmt_device_disconnected() does it internally.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/hci_event.c

index 4d0f4018df187ebda71950cc544f5dc03a30d5a2..142aa61f9c3f51f6159ac1bb22e9471214d2bbe4 100644 (file)
@@ -1792,8 +1792,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
        if (ev->status == 0)
                conn->state = BT_CLOSED;
 
-       if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags) &&
-           (conn->type == ACL_LINK || conn->type == LE_LINK)) {
+       if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) {
                if (ev->status) {
                        mgmt_disconnect_failed(hdev, &conn->dst, conn->type,
                                               conn->dst_type, ev->status);