summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2013-10-30 19:01:42 -0300
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-12-04 11:09:04 -0200
commit4ebbd5357531694b9243b176674ae27edf5bd8e1 (patch)
tree08b66dc0696cbf9e7a7211cd59ba9fa7c218b79b
parent57eb776feac497c8e5b561c0a24156245f0c08db (diff)
downloadtalos-obmc-linux-4ebbd5357531694b9243b176674ae27edf5bd8e1.tar.gz
talos-obmc-linux-4ebbd5357531694b9243b176674ae27edf5bd8e1.zip
Bluetooth: Remove link type check in hci_disconn_complete_evt()
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>
-rw-r--r--net/bluetooth/hci_event.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 4d0f4018df18..142aa61f9c3f 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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);
OpenPOWER on IntegriCloud