1 files changed, 40 insertions, 84 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index b8554d429d88..c2457435a670 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -129,9 +129,6 @@ static const u16 mgmt_events[] = {
 
 #define CACHE_TIMEOUT   msecs_to_jiffies(2 * 1000)
 
-#define hdev_is_powered(hdev) (test_bit(HCI_UP, &hdev->flags) && \
-                                !test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
-
 struct pending_cmd {
         struct list_head list;
         u16 opcode;
@@ -1536,9 +1533,11 @@ static void set_discoverable_complete(struct hci_dev *hdev, u8 status)
 
         /* When the discoverable mode gets changed, make sure
          * that class of device has the limited discoverable
-         * bit correctly set.
+         * bit correctly set. Also update page scan based on whitelist
+         * entries.
          */
         hci_req_init(&req, hdev);
+        hci_update_page_scan(hdev, &req);
         update_class(&req);
         hci_req_run(&req, NULL);
 
@@ -1785,6 +1784,7 @@ static void set_connectable_complete(struct hci_dev *hdev, u8 status)
 
         if (conn_changed || discov_changed) {
                 new_settings(hdev, cmd->sk);
+                hci_update_page_scan(hdev, NULL);
                 if (discov_changed)
                         mgmt_update_adv_data(hdev);
                 hci_update_background_scan(hdev);
@@ -1818,6 +1818,7 @@ static int set_connectable_update_settings(struct hci_dev *hdev,
                 return err;
 
         if (changed) {
+                hci_update_page_scan(hdev, NULL);
                 hci_update_background_scan(hdev);
                 return new_settings(hdev, sk);
         }
@@ -4381,27 +4382,6 @@ unlock:
         return err;
 }
 
-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) ||
-            !list_empty(&hdev->whitelist))
-                scan |= SCAN_PAGE;
-        if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
-                scan |= SCAN_INQUIRY;
-
-        if (scan)
-                hci_req_add(req, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
-}
-
 static void set_bredr_complete(struct hci_dev *hdev, u8 status)
 {
         struct pending_cmd *cmd;
@@ -4507,9 +4487,8 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
 
         hci_req_init(&req, hdev);
 
-        if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags) ||
-            !list_empty(&hdev->whitelist))
-                set_bredr_scan(&req);
+        write_fast_connectable(&req, false);
+        hci_update_page_scan(hdev, &req);
 
         /* Since only the advertising data flags will change, there
          * is no need to update the scan response data.
@@ -5235,27 +5214,6 @@ unlock:
         return err;
 }
 
-/* Helper for Add/Remove Device commands */
-static void update_page_scan(struct hci_dev *hdev, u8 scan)
-{
-        if (!test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags))
-                return;
-
-        if (!hdev_is_powered(hdev))
-                return;
-
-        /* If HCI_CONNECTABLE is set then Add/Remove Device should not
-         * make any changes to page scanning.
-         */
-        if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))
-                return;
-
-        if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
-                scan |= SCAN_INQUIRY;
-
-        hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);
-}
-
 static void device_added(struct sock *sk, struct hci_dev *hdev,
                          bdaddr_t *bdaddr, u8 type, u8 action)
 {
@@ -5291,8 +5249,6 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,
         hci_dev_lock(hdev);
 
         if (cp->addr.type == BDADDR_BREDR) {
-                bool update_scan;
-
                 /* Only incoming connections action is supported for now */
                 if (cp->action != 0x01) {
                         err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_DEVICE,
@@ -5301,15 +5257,12 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,
                         goto unlock;
                 }
 
-                update_scan = list_empty(&hdev->whitelist);
-
                 err = hci_bdaddr_list_add(&hdev->whitelist, &cp->addr.bdaddr,
                                           cp->addr.type);
                 if (err)
                         goto unlock;
 
-                if (update_scan)
-                        update_page_scan(hdev, SCAN_PAGE);
+                hci_update_page_scan(hdev, NULL);
 
                 goto added;
         }
@@ -5392,8 +5345,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
                                 goto unlock;
                         }
 
-                        if (list_empty(&hdev->whitelist))
-                                update_page_scan(hdev, SCAN_DISABLED);
+                        hci_update_page_scan(hdev, NULL);
 
                         device_removed(sk, hdev, &cp->addr.bdaddr,
                                        cp->addr.type);
@@ -5444,7 +5396,7 @@ static int remove_device(struct sock *sk, struct hci_dev *hdev,
                         kfree(b);
                 }
 
-                update_page_scan(hdev, SCAN_DISABLED);
+                hci_update_page_scan(hdev, NULL);
 
                 list_for_each_entry_safe(p, tmp, &hdev->le_conn_params, list) {
                         if (p->auto_connect == HCI_AUTO_CONN_DISABLED)
@@ -5969,8 +5921,8 @@ static int powered_update_hci(struct hci_dev *hdev)
                             sizeof(link_sec), &link_sec);
 
         if (lmp_bredr_capable(hdev)) {
-                if (test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags))
-                        set_bredr_scan(&req);
+                write_fast_connectable(&req, false);
+                hci_update_page_scan(hdev, &req);
                 update_class(&req);
                 update_name(&req);
                 update_eir(&req);
@@ -6281,25 +6233,35 @@ static void unpair_device_rsp(struct pending_cmd *cmd, void *data)
         mgmt_pending_remove(cmd);
 }
 
+bool mgmt_powering_down(struct hci_dev *hdev)
+{
+        struct pending_cmd *cmd;
+        struct mgmt_mode *cp;
+
+        cmd = mgmt_pending_find(MGMT_OP_SET_POWERED, hdev);
+        if (!cmd)
+                return false;
+
+        cp = cmd->param;
+        if (!cp->val)
+                return true;
+
+        return false;
+}
+
 void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
                               u8 link_type, u8 addr_type, u8 reason,
                               bool mgmt_connected)
 {
         struct mgmt_ev_device_disconnected ev;
-        struct pending_cmd *power_off;
         struct sock *sk = NULL;
 
-        power_off = mgmt_pending_find(MGMT_OP_SET_POWERED, hdev);
-        if (power_off) {
-                struct mgmt_mode *cp = power_off->param;
-
-                /* The connection is still in hci_conn_hash so test for 1
-                 * instead of 0 to know if this is the last one.
-                 */
-                if (!cp->val && hci_conn_count(hdev) == 1) {
-                        cancel_delayed_work(&hdev->power_off);
-                        queue_work(hdev->req_workqueue, &hdev->power_off.work);
-                }
+        /* The connection is still in hci_conn_hash so test for 1
+         * instead of 0 to know if this is the last one.
+         */
+        if (mgmt_powering_down(hdev) && hci_conn_count(hdev) == 1) {
+                cancel_delayed_work(&hdev->power_off);
+                queue_work(hdev->req_workqueue, &hdev->power_off.work);
         }
 
         if (!mgmt_connected)
@@ -6359,19 +6321,13 @@ void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
                          u8 addr_type, u8 status)
 {
         struct mgmt_ev_connect_failed ev;
-        struct pending_cmd *power_off;
-
-        power_off = mgmt_pending_find(MGMT_OP_SET_POWERED, hdev);
-        if (power_off) {
-                struct mgmt_mode *cp = power_off->param;
 
-                /* The connection is still in hci_conn_hash so test for 1
-                 * instead of 0 to know if this is the last one.
-                 */
-                if (!cp->val && hci_conn_count(hdev) == 1) {
-                        cancel_delayed_work(&hdev->power_off);
-                        queue_work(hdev->req_workqueue, &hdev->power_off.work);
-                }
+        /* The connection is still in hci_conn_hash so test for 1
+         * instead of 0 to know if this is the last one.
+         */
+        if (mgmt_powering_down(hdev) && hci_conn_count(hdev) == 1) {
+                cancel_delayed_work(&hdev->power_off);
+                queue_work(hdev->req_workqueue, &hdev->power_off.work);
         }
 
         bacpy(&ev.addr.bdaddr, bdaddr);