Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2 files changed, 7 insertions, 0 deletions

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index f0a3d8890760..e3fd926df13f 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1074,6 +1074,8 @@ struct hci_rp_read_data_block_size {
         __le16   num_blocks;
 } __packed;
 
+#define HCI_OP_READ_LOCAL_CODECS        0x100b
+
 #define HCI_OP_READ_PAGE_SCAN_ACTIVITY  0x0c1b
 struct hci_rp_read_page_scan_activity {
         __u8     status;
@@ -1170,6 +1172,8 @@ struct hci_rp_write_remote_amp_assoc {
         __u8     phy_handle;
 } __packed;
 
+#define HCI_OP_GET_MWS_TRANSPORT_CONFIG 0x140c
+
 #define HCI_OP_ENABLE_DUT_MODE          0x1803
 
 #define HCI_OP_WRITE_SSP_DEBUG_MODE     0x1804
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 996ed065b6c2..b5d5af3aa469 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -203,6 +203,8 @@ struct hci_dev {
         __u16           page_scan_window;
         __u8            page_scan_type;
         __u8            le_adv_channel_map;
+        __u16           le_adv_min_interval;
+        __u16           le_adv_max_interval;
         __u8            le_scan_type;
         __u16           le_scan_interval;
         __u16           le_scan_window;
@@ -458,6 +460,7 @@ struct hci_conn_params {
         enum {
                 HCI_AUTO_CONN_DISABLED,
                 HCI_AUTO_CONN_REPORT,
+                HCI_AUTO_CONN_DIRECT,
                 HCI_AUTO_CONN_ALWAYS,
                 HCI_AUTO_CONN_LINK_LOSS,
         } auto_connect;