1 files changed, 24 insertions, 36 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index a6e0f3d8da6..ad6613d17ca 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -210,7 +210,7 @@ static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
 
         BT_DBG("sock %p, index %u, cmd %u, status %u", sk, index, cmd, status);
 
-        skb = alloc_skb(sizeof(*hdr) + sizeof(*ev), GFP_ATOMIC);
+        skb = alloc_skb(sizeof(*hdr) + sizeof(*ev), GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
 
@@ -241,7 +241,7 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,
 
         BT_DBG("sock %p", sk);
 
-        skb = alloc_skb(sizeof(*hdr) + sizeof(*ev) + rp_len, GFP_ATOMIC);
+        skb = alloc_skb(sizeof(*hdr) + sizeof(*ev) + rp_len, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
 
@@ -687,14 +687,14 @@ static struct pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,
 {
         struct pending_cmd *cmd;
 
-        cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);
+        cmd = kmalloc(sizeof(*cmd), GFP_KERNEL);
         if (!cmd)
                 return NULL;
 
         cmd->opcode = opcode;
         cmd->index = hdev->id;
 
-        cmd->param = kmalloc(len, GFP_ATOMIC);
+        cmd->param = kmalloc(len, GFP_KERNEL);
         if (!cmd->param) {
                 kfree(cmd);
                 return NULL;
@@ -812,7 +812,7 @@ static int mgmt_event(u16 event, struct hci_dev *hdev, void *data, u16 data_len,
         struct sk_buff *skb;
         struct mgmt_hdr *hdr;
 
-        skb = alloc_skb(sizeof(*hdr) + data_len, GFP_ATOMIC);
+        skb = alloc_skb(sizeof(*hdr) + data_len, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
 
@@ -1268,7 +1268,7 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
                 goto failed;
         }
 
-        uuid = kmalloc(sizeof(*uuid), GFP_ATOMIC);
+        uuid = kmalloc(sizeof(*uuid), GFP_KERNEL);
         if (!uuid) {
                 err = -ENOMEM;
                 goto failed;
@@ -1611,7 +1611,7 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data,
         }
 
         dc.handle = cpu_to_le16(conn->handle);
-        dc.reason = 0x13; /* Remote User Terminated Connection */
+        dc.reason = HCI_ERROR_REMOTE_USER_TERM;
 
         err = hci_send_cmd(hdev, HCI_OP_DISCONNECT, sizeof(dc), &dc);
         if (err < 0)
@@ -1667,7 +1667,7 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
         }
 
         rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));
-        rp = kmalloc(rp_len, GFP_ATOMIC);
+        rp = kmalloc(rp_len, GFP_KERNEL);
         if (!rp) {
                 err = -ENOMEM;
                 goto unlock;
@@ -1778,29 +1778,6 @@ failed:
         return err;
 }
 
-static int pin_code_neg_reply(struct sock *sk, struct hci_dev *hdev,
-                              void *data, u16 len)
-{
-        struct mgmt_cp_pin_code_neg_reply *cp = data;
-        int err;
-
-        BT_DBG("");
-
-        hci_dev_lock(hdev);
-
-        if (!hdev_is_powered(hdev)) {
-                err = cmd_status(sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY,
-                                 MGMT_STATUS_NOT_POWERED);
-                goto failed;
-        }
-
-        err = send_pin_code_neg_reply(sk, hdev, cp);
-
-failed:
-        hci_dev_unlock(hdev);
-        return err;
-}
-
 static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,
                              u16 len)
 {
@@ -2083,6 +2060,18 @@ done:
         return err;
 }
 
+static int pin_code_neg_reply(struct sock *sk, struct hci_dev *hdev,
+                              void *data, u16 len)
+{
+        struct mgmt_cp_pin_code_neg_reply *cp = data;
+
+        BT_DBG("");
+
+        return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+                                MGMT_OP_PIN_CODE_NEG_REPLY,
+                                HCI_OP_PIN_CODE_NEG_REPLY, 0);
+}
+
 static int user_confirm_reply(struct sock *sk, struct hci_dev *hdev, void *data,
                               u16 len)
 {
@@ -2607,8 +2596,8 @@ static int set_fast_connectable(struct sock *sk, struct hci_dev *hdev,
         if (cp->val) {
                 type = PAGE_SCAN_TYPE_INTERLACED;
 
-                /* 22.5 msec page scan interval */
-                acp.interval = __constant_cpu_to_le16(0x0024);
+                /* 160 msec page scan interval */
+                acp.interval = __constant_cpu_to_le16(0x0100);
         } else {
                 type = PAGE_SCAN_TYPE_STANDARD; /* default */
 
@@ -3546,9 +3535,9 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
         ev->addr.type = link_to_bdaddr(link_type, addr_type);
         ev->rssi = rssi;
         if (cfm_name)
-                ev->flags[0] |= MGMT_DEV_FOUND_CONFIRM_NAME;
+                ev->flags |= cpu_to_le32(MGMT_DEV_FOUND_CONFIRM_NAME);
         if (!ssp)
-                ev->flags[0] |= MGMT_DEV_FOUND_LEGACY_PAIRING;
+                ev->flags |= cpu_to_le32(MGMT_DEV_FOUND_LEGACY_PAIRING);
 
         if (eir_len > 0)
                 memcpy(ev->eir, eir, eir_len);
@@ -3558,7 +3547,6 @@ int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
                                           dev_class, 3);
 
         ev->eir_len = cpu_to_le16(eir_len);
-
         ev_size = sizeof(*ev) + eir_len;
 
         return mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, ev_size, NULL);