1 files changed, 8 insertions, 9 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 03e7e732215f..4c830c62ef74 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -106,11 +106,10 @@ static const u16 mgmt_events[] = {
  * These LE scan and inquiry parameters were chosen according to LE General
  * Discovery Procedure specification.
  */
-#define LE_SCAN_TYPE                    0x01
 #define LE_SCAN_WIN                     0x12
 #define LE_SCAN_INT                     0x12
-#define LE_SCAN_TIMEOUT_LE_ONLY         10240   /* TGAP(gen_disc_scan_min) */
-#define LE_SCAN_TIMEOUT_BREDR_LE        5120    /* TGAP(100)/2 */
+#define LE_SCAN_TIMEOUT_LE_ONLY         msecs_to_jiffies(10240)
+#define LE_SCAN_TIMEOUT_BREDR_LE        msecs_to_jiffies(5120)
 
 #define INQUIRY_LEN_BREDR               0x08    /* TGAP(100) */
 #define INQUIRY_LEN_BREDR_LE            0x04    /* TGAP(100)/2 */
@@ -2131,7 +2130,7 @@ static void pairing_complete(struct pending_cmd *cmd, u8 status)
         conn->security_cfm_cb = NULL;
         conn->disconn_cfm_cb = NULL;
 
-        hci_conn_put(conn);
+        hci_conn_drop(conn);
 
         mgmt_pending_remove(cmd);
 }
@@ -2222,7 +2221,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
         }
 
         if (conn->connect_cfm_cb) {
-                hci_conn_put(conn);
+                hci_conn_drop(conn);
                 err = cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
                                    MGMT_STATUS_BUSY, &rp, sizeof(rp));
                 goto unlock;
@@ -2231,7 +2230,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
         cmd = mgmt_pending_add(sk, MGMT_OP_PAIR_DEVICE, hdev, data, len);
         if (!cmd) {
                 err = -ENOMEM;
-                hci_conn_put(conn);
+                hci_conn_drop(conn);
                 goto unlock;
         }
 
@@ -2703,7 +2702,7 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
                         goto failed;
                 }
 
-                err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT,
+                err = hci_le_scan(hdev, LE_SCAN_ACTIVE, LE_SCAN_INT,
                                   LE_SCAN_WIN, LE_SCAN_TIMEOUT_LE_ONLY);
                 break;
 
@@ -2715,8 +2714,8 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev,
                         goto failed;
                 }
 
-                err = hci_le_scan(hdev, LE_SCAN_TYPE, LE_SCAN_INT, LE_SCAN_WIN,
-                                  LE_SCAN_TIMEOUT_BREDR_LE);
+                err = hci_le_scan(hdev, LE_SCAN_ACTIVE, LE_SCAN_INT,
+                                  LE_SCAN_WIN, LE_SCAN_TIMEOUT_BREDR_LE);
                 break;
 
         default: