Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / bluetooth / mgmt.c

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 98f6295edbecd791b777ebfca7dc0f7cbce4dda5..03e7e732215f7e11d9cfca1c6b7c93c70dc96090 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1002,9 +1002,13 @@ failed:
 
 static void write_fast_connectable(struct hci_request *req, bool enable)
 {
+       struct hci_dev *hdev = req->hdev;
        struct hci_cp_write_page_scan_activity acp;
        u8 type;
 
+       if (hdev->hci_ver < BLUETOOTH_VER_1_2)
+               return;
+
        if (enable) {
                type = PAGE_SCAN_TYPE_INTERLACED;
 
@@ -1019,8 +1023,13 @@ static void write_fast_connectable(struct hci_request *req, bool enable)
 
        acp.window = __constant_cpu_to_le16(0x0012);
 
-       hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_ACTIVITY, sizeof(acp), &acp);
-       hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_TYPE, 1, &type);
+       if (__cpu_to_le16(hdev->page_scan_interval) != acp.interval ||
+           __cpu_to_le16(hdev->page_scan_window) != acp.window)
+               hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_ACTIVITY,
+                           sizeof(acp), &acp);
+
+       if (hdev->page_scan_type != type)
+               hci_req_add(req, HCI_OP_WRITE_PAGE_SCAN_TYPE, 1, &type);
 }
 
 static void set_connectable_complete(struct hci_dev *hdev, u8 status)
@@ -1119,7 +1128,13 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data,
 
        hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
 
-       if (!cp->val && test_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags))
+       /* If we're going from non-connectable to connectable or
+        * vice-versa when fast connectable is enabled ensure that fast
+        * connectable gets disabled. write_fast_connectable won't do
+        * anything if the page scan parameters are already what they
+        * should be.
+        */
+       if (cp->val || test_bit(HCI_FAST_CONNECTABLE, &hdev->dev_flags))
                write_fast_connectable(&req, false);
 
        err = hci_req_run(&req, set_connectable_complete);
@@ -2285,7 +2300,7 @@ unlock:
 }
 
 static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
-                            bdaddr_t *bdaddr, u8 type, u16 mgmt_op,
+                            struct mgmt_addr_info *addr, u16 mgmt_op,
                             u16 hci_op, __le32 passkey)
 {
        struct pending_cmd *cmd;
@@ -2295,37 +2310,41 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
        hci_dev_lock(hdev);
 
        if (!hdev_is_powered(hdev)) {
-               err = cmd_status(sk, hdev->id, mgmt_op,
-                                MGMT_STATUS_NOT_POWERED);
+               err = cmd_complete(sk, hdev->id, mgmt_op,
+                                  MGMT_STATUS_NOT_POWERED, addr,
+                                  sizeof(*addr));
                goto done;
        }
 
-       if (type == BDADDR_BREDR)
-               conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, bdaddr);
+       if (addr->type == BDADDR_BREDR)
+               conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &addr->bdaddr);
        else
-               conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, bdaddr);
+               conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &addr->bdaddr);
 
        if (!conn) {
-               err = cmd_status(sk, hdev->id, mgmt_op,
-                                MGMT_STATUS_NOT_CONNECTED);
+               err = cmd_complete(sk, hdev->id, mgmt_op,
+                                  MGMT_STATUS_NOT_CONNECTED, addr,
+                                  sizeof(*addr));
                goto done;
        }
 
-       if (type == BDADDR_LE_PUBLIC || type == BDADDR_LE_RANDOM) {
+       if (addr->type == BDADDR_LE_PUBLIC || addr->type == BDADDR_LE_RANDOM) {
                /* Continue with pairing via SMP */
                err = smp_user_confirm_reply(conn, mgmt_op, passkey);
 
                if (!err)
-                       err = cmd_status(sk, hdev->id, mgmt_op,
-                                        MGMT_STATUS_SUCCESS);
+                       err = cmd_complete(sk, hdev->id, mgmt_op,
+                                          MGMT_STATUS_SUCCESS, addr,
+                                          sizeof(*addr));
                else
-                       err = cmd_status(sk, hdev->id, mgmt_op,
-                                        MGMT_STATUS_FAILED);
+                       err = cmd_complete(sk, hdev->id, mgmt_op,
+                                          MGMT_STATUS_FAILED, addr,
+                                          sizeof(*addr));
 
                goto done;
        }
 
-       cmd = mgmt_pending_add(sk, mgmt_op, hdev, bdaddr, sizeof(*bdaddr));
+       cmd = mgmt_pending_add(sk, mgmt_op, hdev, addr, sizeof(*addr));
        if (!cmd) {
                err = -ENOMEM;
                goto done;
@@ -2335,11 +2354,12 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
        if (hci_op == HCI_OP_USER_PASSKEY_REPLY) {
                struct hci_cp_user_passkey_reply cp;
 
-               bacpy(&cp.bdaddr, bdaddr);
+               bacpy(&cp.bdaddr, &addr->bdaddr);
                cp.passkey = passkey;
                err = hci_send_cmd(hdev, hci_op, sizeof(cp), &cp);
        } else
-               err = hci_send_cmd(hdev, hci_op, sizeof(*bdaddr), bdaddr);
+               err = hci_send_cmd(hdev, hci_op, sizeof(addr->bdaddr),
+                                  &addr->bdaddr);
 
        if (err < 0)
                mgmt_pending_remove(cmd);
@@ -2356,7 +2376,7 @@ static int pin_code_neg_reply(struct sock *sk, struct hci_dev *hdev,
 
        BT_DBG("");
 
-       return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+       return user_pairing_resp(sk, hdev, &cp->addr,
                                MGMT_OP_PIN_CODE_NEG_REPLY,
                                HCI_OP_PIN_CODE_NEG_REPLY, 0);
 }
@@ -2372,7 +2392,7 @@ static int user_confirm_reply(struct sock *sk, struct hci_dev *hdev, void *data,
                return cmd_status(sk, hdev->id, MGMT_OP_USER_CONFIRM_REPLY,
                                  MGMT_STATUS_INVALID_PARAMS);
 
-       return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+       return user_pairing_resp(sk, hdev, &cp->addr,
                                 MGMT_OP_USER_CONFIRM_REPLY,
                                 HCI_OP_USER_CONFIRM_REPLY, 0);
 }
@@ -2384,7 +2404,7 @@ static int user_confirm_neg_reply(struct sock *sk, struct hci_dev *hdev,
 
        BT_DBG("");
 
-       return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+       return user_pairing_resp(sk, hdev, &cp->addr,
                                 MGMT_OP_USER_CONFIRM_NEG_REPLY,
                                 HCI_OP_USER_CONFIRM_NEG_REPLY, 0);
 }
@@ -2396,7 +2416,7 @@ static int user_passkey_reply(struct sock *sk, struct hci_dev *hdev, void *data,
 
        BT_DBG("");
 
-       return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+       return user_pairing_resp(sk, hdev, &cp->addr,
                                 MGMT_OP_USER_PASSKEY_REPLY,
                                 HCI_OP_USER_PASSKEY_REPLY, cp->passkey);
 }
@@ -2408,7 +2428,7 @@ static int user_passkey_neg_reply(struct sock *sk, struct hci_dev *hdev,
 
        BT_DBG("");
 
-       return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
+       return user_pairing_resp(sk, hdev, &cp->addr,
                                 MGMT_OP_USER_PASSKEY_NEG_REPLY,
                                 HCI_OP_USER_PASSKEY_NEG_REPLY, 0);
 }
@@ -3281,6 +3301,12 @@ static void set_bredr_scan(struct hci_request *req)
        struct hci_dev *hdev = req->hdev;
        u8 scan = 0;
 
+       /* Ensure that fast connectable is disabled. This function will
+        * not do anything if the page scan parameters are already what
+        * they should be.
+        */
+       write_fast_connectable(req, false);
+
        if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))
                scan |= SCAN_PAGE;
        if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))