Bluetooth: hci_sync: Rework background scan

This replaces the use of hci_update_background_scan with
hci_update_passive_scan which runs from cmd_work_sync and deal properly
with resolving list when LL privacy is enabled.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index bd669c9..1783ec5 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -108,7 +108,7 @@ static void hci_connect_le_scan_cleanup(struct hci_conn *conn)
                break;
        }
 
-       hci_update_background_scan(hdev);
+       hci_update_passive_scan(hdev);
 }
 
 static void hci_conn_cleanup(struct hci_conn *conn)
@@ -913,7 +913,7 @@ void hci_le_conn_failed(struct hci_conn *conn, u8 status)
        /* Since we may have temporarily stopped the background scanning in
         * favor of connection establishment, we should restart it.
         */
-       hci_update_background_scan(hdev);
+       hci_update_passive_scan(hdev);
 
        /* Re-enable advertising in case this was a failed connection
         * attempt as a peripheral.
@@ -1411,7 +1411,7 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst,
        conn->conn_timeout = conn_timeout;
        conn->conn_reason = conn_reason;
 
-       hci_update_background_scan(hdev);
+       hci_update_passive_scan(hdev);
 
 done:
        hci_conn_hold(conn);

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index fdc1cce..8c54b1d 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -975,7 +975,7 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
 
        switch (state) {
        case DISCOVERY_STOPPED:
-               hci_update_background_scan(hdev);
+               hci_update_passive_scan(hdev);
 
                if (old_state != DISCOVERY_STARTING)
                        mgmt_discovering(hdev, 0);
@@ -1850,7 +1850,7 @@ done:
        return ret;
 }
 
-static void hci_update_scan_state(struct hci_dev *hdev, u8 scan)
+static void hci_update_passive_scan_state(struct hci_dev *hdev, u8 scan)
 {
        bool conn_changed, discov_changed;
 
@@ -1951,7 +1951,7 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
                 * get correctly modified as this was a non-mgmt change.
                 */
                if (!err)
-                       hci_update_scan_state(hdev, dr.dev_opt);
+                       hci_update_passive_scan_state(hdev, dr.dev_opt);
                break;
 
        case HCISETLINKPOL:
@@ -3096,7 +3096,7 @@ bool hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor,
 
        switch (hci_get_adv_monitor_offload_ext(hdev)) {
        case HCI_ADV_MONITOR_EXT_NONE:
-               hci_update_background_scan(hdev);
+               hci_update_passive_scan(hdev);
                bt_dev_dbg(hdev, "%s add monitor status %d", hdev->name, *err);
                /* Message was not forwarded to controller - not an error */
                return false;
@@ -3160,7 +3160,7 @@ bool hci_remove_single_adv_monitor(struct hci_dev *hdev, u16 handle, int *err)
 
        pending = hci_remove_adv_monitor(hdev, monitor, handle, err);
        if (!*err && !pending)
-               hci_update_background_scan(hdev);
+               hci_update_passive_scan(hdev);
 
        bt_dev_dbg(hdev, "%s remove monitor handle %d, status %d, %spending",
                   hdev->name, handle, *err, pending ? "" : "not ");
@@ -3192,7 +3192,7 @@ bool hci_remove_all_adv_monitor(struct hci_dev *hdev, int *err)
        }
 
        if (update)
-               hci_update_background_scan(hdev);
+               hci_update_passive_scan(hdev);
 
        bt_dev_dbg(hdev, "%s remove all monitors status %d, %spending",
                   hdev->name, *err, pending ? "" : "not ");
@@ -3486,7 +3486,7 @@ void hci_conn_params_del(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type)
 
        hci_conn_params_free(params);
 
-       hci_update_background_scan(hdev);
+       hci_update_passive_scan(hdev);
 
        BT_DBG("addr %pMR (type %u)", addr, addr_type);
 }

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e45e62b..d5e4a82 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3028,7 +3028,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
                case HCI_AUTO_CONN_ALWAYS:
                        list_del_init(&params->action);
                        list_add(&params->action, &hdev->pend_le_conns);
-                       hci_update_background_scan(hdev);
+                       hci_update_passive_scan(hdev);
                        break;
 
                default:
@@ -5471,7 +5471,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
        }
 
 unlock:
-       hci_update_background_scan(hdev);
+       hci_update_passive_scan(hdev);
        hci_dev_unlock(hdev);
 }
 

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index c9aba2f..6d53a87 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2029,5 +2029,14 @@ static int update_passive_scan_sync(struct hci_dev *hdev, void *data)
 
 int hci_update_passive_scan(struct hci_dev *hdev)
 {
+       /* Only queue if it would have any effect */
+       if (!test_bit(HCI_UP, &hdev->flags) ||
+           test_bit(HCI_INIT, &hdev->flags) ||
+           hci_dev_test_flag(hdev, HCI_SETUP) ||
+           hci_dev_test_flag(hdev, HCI_CONFIG) ||
+           hci_dev_test_flag(hdev, HCI_AUTO_OFF) ||
+           hci_dev_test_flag(hdev, HCI_UNREGISTER))
+               return 0;
+
        return hci_cmd_sync_queue(hdev, update_passive_scan_sync, NULL, NULL);
 }

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ca2273a..d09a757 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1585,7 +1585,7 @@ static int set_connectable_update_settings(struct hci_dev *hdev,
 
        if (changed) {
                hci_req_update_scan(hdev);
-               hci_update_background_scan(hdev);
+               hci_update_passive_scan(hdev);
                return new_settings(hdev, sk);
        }
 
@@ -1943,7 +1943,7 @@ static void le_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)
                        __hci_req_update_scan_rsp_data(&req, 0x00);
                }
                hci_req_run(&req, NULL);
-               hci_update_background_scan(hdev);
+               hci_update_passive_scan(hdev);
        }
 
 unlock:
@@ -4488,7 +4488,7 @@ int mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev, u8 status)
                hdev->adv_monitors_cnt++;
                if (monitor->state == ADV_MONITOR_STATE_NOT_REGISTERED)
                        monitor->state = ADV_MONITOR_STATE_REGISTERED;
-               hci_update_background_scan(hdev);
+               hci_update_passive_scan(hdev);
        }
 
        err = mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode,
@@ -4714,7 +4714,7 @@ int mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, u8 status)
        rp.monitor_handle = cp->monitor_handle;
 
        if (!status)
-               hci_update_background_scan(hdev);
+               hci_update_passive_scan(hdev);
 
        err = mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode,
                                mgmt_status(status), &rp, sizeof(rp));

diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c
index 255cffa..5205d94 100644 (file)
--- a/net/bluetooth/msft.c
+++ b/net/bluetooth/msft.c
@@ -168,7 +168,7 @@ static void reregister_monitor(struct hci_dev *hdev, int handle)
                if (!monitor) {
                        /* All monitors have been reregistered */
                        msft->reregistering = false;
-                       hci_update_background_scan(hdev);
+                       hci_update_passive_scan(hdev);
                        return;
                }