4 files changed, 42 insertions, 21 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7107790817a..634a0cdcdad 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -958,7 +958,8 @@ int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
                                         u8 *dev_class);
 int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
                                                 u8 link_type, u8 addr_type);
-int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 status);
+int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
+                                        u8 link_type, u8 addr_type, u8 status);
 int mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
                                                 u8 addr_type, u8 status);
 int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure);
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 4c18cd5fb8c..735e547e344 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -177,10 +177,10 @@ struct mgmt_cp_load_long_term_keys {
 
 #define MGMT_OP_DISCONNECT              0x0014
 struct mgmt_cp_disconnect {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
 } __packed;
 struct mgmt_rp_disconnect {
-        bdaddr_t bdaddr;
+        struct mgmt_addr_info addr;
         __u8 status;
 } __packed;
 
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index ad5f37b13f7..f0c822db28d 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1550,6 +1550,28 @@ static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status)
         hci_dev_unlock(hdev);
 }
 
+static void hci_cs_disconnect(struct hci_dev *hdev, u8 status)
+{
+        struct hci_cp_disconnect *cp;
+        struct hci_conn *conn;
+
+        if (!status)
+                return;
+
+        cp = hci_sent_cmd_data(hdev, HCI_OP_DISCONNECT);
+        if (!cp)
+                return;
+
+        hci_dev_lock(hdev);
+
+        conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
+        if (conn)
+                mgmt_disconnect_failed(hdev, &conn->dst, conn->type,
+                                                conn->dst_type, status);
+
+        hci_dev_unlock(hdev);
+}
+
 static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
 {
         struct hci_cp_le_create_conn *cp;
@@ -1839,7 +1861,8 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff
         if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags) &&
                         (conn->type == ACL_LINK || conn->type == LE_LINK)) {
                 if (ev->status != 0)
-                        mgmt_disconnect_failed(hdev, &conn->dst, ev->status);
+                        mgmt_disconnect_failed(hdev, &conn->dst, conn->type,
+                                                conn->dst_type, ev->status);
                 else
                         mgmt_device_disconnected(hdev, &conn->dst, conn->type,
                                                         conn->dst_type);
@@ -2350,8 +2373,7 @@ static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
                 break;
 
         case HCI_OP_DISCONNECT:
-                if (ev->status != 0)
-                        mgmt_disconnect_failed(hdev, NULL, ev->status);
+                hci_cs_disconnect(hdev, ev->status);
                 break;
 
         case HCI_OP_LE_CREATE_CONN:
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index c64e5db7f59..f1257ee5afb 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1185,9 +1185,10 @@ static int disconnect(struct sock *sk, u16 index, void *data, u16 len)
                 goto failed;
         }
 
-        conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
-        if (!conn)
-                conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->bdaddr);
+        if (cp->addr.type == MGMT_ADDR_BREDR)
+                conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->addr.bdaddr);
+        else
+                conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);
 
         if (!conn) {
                 err = cmd_status(sk, index, MGMT_OP_DISCONNECT,
@@ -2619,7 +2620,8 @@ static void disconnect_rsp(struct pending_cmd *cmd, void *data)
         struct sock **sk = data;
         struct mgmt_rp_disconnect rp;
 
-        bacpy(&rp.bdaddr, &cp->bdaddr);
+        bacpy(&rp.addr.bdaddr, &cp->addr.bdaddr);
+        rp.addr.type = cp->addr.type;
         rp.status = 0;
 
         cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT, &rp, sizeof(rp));
@@ -2672,27 +2674,23 @@ int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
         return err;
 }
 
-int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 status)
+int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
+                                        u8 link_type, u8 addr_type, u8 status)
 {
+        struct mgmt_rp_disconnect rp;
         struct pending_cmd *cmd;
-        u8 mgmt_err = mgmt_status(status);
         int err;
 
         cmd = mgmt_pending_find(MGMT_OP_DISCONNECT, hdev);
         if (!cmd)
                 return -ENOENT;
 
-        if (bdaddr) {
-                struct mgmt_rp_disconnect rp;
-
-                bacpy(&rp.bdaddr, bdaddr);
-                rp.status = status;
+        bacpy(&rp.addr.bdaddr, bdaddr);
+        rp.addr.type = link_to_mgmt(link_type, addr_type);
+        rp.status = mgmt_status(status);
 
-                err = cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT,
+        err = cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT,
                                                         &rp, sizeof(rp));
-        } else
-                err = cmd_status(cmd->sk, hdev->id, MGMT_OP_DISCONNECT,
-                                                                mgmt_err);
 
         mgmt_pending_remove(cmd);