diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-05-12 14:06:10 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-12 14:06:10 -0400 |
commit | 15cb309614f35df344b9f06a9ea9f077d1e449db (patch) | |
tree | 85e244564f42381be5bf9d81ed867bb793fa976d /net/bluetooth/hci_event.c | |
parent | 4daf50f20256e0022c87c1609226e971a70c82fd (diff) | |
parent | 55183d06cd1bd939ceccdad628b0aae12c86b803 (diff) | |
download | kernel_samsung_smdk4412-15cb309614f35df344b9f06a9ea9f077d1e449db.zip kernel_samsung_smdk4412-15cb309614f35df344b9f06a9ea9f077d1e449db.tar.gz kernel_samsung_smdk4412-15cb309614f35df344b9f06a9ea9f077d1e449db.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index d5aa97e..f13ddbf 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1440,7 +1440,7 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff conn->state = BT_CLOSED; - if (conn->type == ACL_LINK) + if (conn->type == ACL_LINK || conn->type == LE_LINK) mgmt_disconnected(hdev->id, &conn->dst); hci_proto_disconn_cfm(conn, ev->reason); @@ -2659,12 +2659,15 @@ static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff } if (ev->status) { + mgmt_connect_failed(hdev->id, &ev->bdaddr, ev->status); hci_proto_connect_cfm(conn, ev->status); conn->state = BT_CLOSED; hci_conn_del(conn); goto unlock; } + mgmt_connected(hdev->id, &ev->bdaddr); + conn->handle = __le16_to_cpu(ev->handle); conn->state = BT_CONNECTED; |