Bluetooth: Fix discovery state machine

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bluetooth / hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index ae86cdd80ac0b7499dd533faafd839bd3eb68ba9..9ada16449aed63b588adf5257c6e1037e65e1e80 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -735,6 +735,8 @@ static int hci_dev_do_close(struct hci_dev *hdev)
 {
        BT_DBG("%s %p", hdev->name, hdev);
 
+       cancel_work_sync(&hdev->le_scan);
+
        hci_req_cancel(hdev, ENODEV);
        hci_req_lock(hdev);
 
@@ -1487,7 +1489,7 @@ int hci_blacklist_clear(struct hci_dev *hdev)
        return 0;
 }
 
-int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr)
+int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)
 {
        struct bdaddr_list *entry;
 
@@ -1505,10 +1507,10 @@ int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr)
 
        list_add(&entry->list, &hdev->blacklist);
 
-       return mgmt_device_blocked(hdev, bdaddr);
+       return mgmt_device_blocked(hdev, bdaddr, type);
 }
 
-int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr)
+int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type)
 {
        struct bdaddr_list *entry;
 
@@ -1522,7 +1524,7 @@ int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr)
        list_del(&entry->list);
        kfree(entry);
 
-       return mgmt_device_unblocked(hdev, bdaddr);
+       return mgmt_device_unblocked(hdev, bdaddr, type);
 }
 
 static void hci_clear_adv_cache(struct work_struct *work)
@@ -1668,6 +1670,37 @@ static void le_scan_disable_work(struct work_struct *work)
        hci_send_cmd(hdev, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &cp);
 }
 
+static void le_scan_work(struct work_struct *work)
+{
+       struct hci_dev *hdev = container_of(work, struct hci_dev, le_scan);
+       struct le_scan_params *param = &hdev->le_scan_params;
+
+       BT_DBG("%s", hdev->name);
+
+       hci_do_le_scan(hdev, param->type, param->interval,
+                                       param->window, param->timeout);
+}
+
+int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,
+                                                               int timeout)
+{
+       struct le_scan_params *param = &hdev->le_scan_params;
+
+       BT_DBG("%s", hdev->name);
+
+       if (work_busy(&hdev->le_scan))
+               return -EINPROGRESS;
+
+       param->type = type;
+       param->interval = interval;
+       param->window = window;
+       param->timeout = timeout;
+
+       queue_work(system_long_wq, &hdev->le_scan);
+
+       return 0;
+}
+
 /* Register HCI device */
 int hci_register_dev(struct hci_dev *hdev)
 {
@@ -1754,6 +1787,8 @@ int hci_register_dev(struct hci_dev *hdev)
 
        atomic_set(&hdev->promisc, 0);
 
+       INIT_WORK(&hdev->le_scan, le_scan_work);
+
        INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable_work);
 
        write_unlock(&hci_dev_list_lock);