Merge tag 'trace-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / net / bluetooth / hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b0d9c36..fd12f16 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -44,6 +44,7 @@
 #include "smp.h"
 #include "leds.h"
 #include "msft.h"
+#include "aosp.h"
 
 static void hci_rx_work(struct work_struct *work);
 static void hci_cmd_work(struct work_struct *work);
@@ -1586,6 +1587,7 @@ setup_failed:
                ret = hdev->set_diag(hdev, true);
 
        msft_do_open(hdev);
+       aosp_do_open(hdev);
 
        clear_bit(HCI_INIT, &hdev->flags);
 
@@ -1782,6 +1784,7 @@ int hci_dev_do_close(struct hci_dev *hdev)
 
        hci_sock_dev_event(hdev, HCI_DEV_DOWN);
 
+       aosp_do_close(hdev);
        msft_do_close(hdev);
 
        if (hdev->flush)
@@ -3760,6 +3763,8 @@ struct hci_dev *hci_alloc_dev(void)
        hdev->le_scan_window_suspend = 0x0012;
        hdev->le_scan_int_discovery = DISCOV_LE_SCAN_INT;
        hdev->le_scan_window_discovery = DISCOV_LE_SCAN_WIN;
+       hdev->le_scan_int_adv_monitor = 0x0060;
+       hdev->le_scan_window_adv_monitor = 0x0030;
        hdev->le_scan_int_connect = 0x0060;
        hdev->le_scan_window_connect = 0x0060;
        hdev->le_conn_min_interval = 0x0018;