diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-10 14:24:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-10 14:24:57 -0700 |
| commit | 0780b866668ed5f88fd79e96ea8ac94258939ae0 (patch) | |
| tree | 313c6b20a1891fe10f7f8d67bbaa62e654af9495 /include/net | |
| parent | fd685657cd5441e504113db1928196d030c8c414 (diff) | |
| parent | aa12af77aae05008b3e637b85944dcd512f75eba (diff) | |
| download | linux-0780b866668ed5f88fd79e96ea8ac94258939ae0.tar.gz linux-0780b866668ed5f88fd79e96ea8ac94258939ae0.tar.bz2 linux-0780b866668ed5f88fd79e96ea8ac94258939ae0.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2018-08-10
Here's one more (most likely last) bluetooth-next pull request for the
4.19 kernel.
- Added support for MediaTek serial Bluetooth devices
- Initial skeleton for controller-side address resolution support
- Fix BT_HCIUART_RTL related Kconfig dependencies
- A few other minor fixes/cleanups
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 7f008097552e..cdd9f1fe7cfa 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -269,6 +269,7 @@ enum { HCI_VENDOR_DIAG, HCI_FORCE_BREDR_SMP, HCI_FORCE_STATIC_ADDR, + HCI_LL_RPA_RESOLUTION, __HCI_NUM_FLAGS, }; @@ -1524,6 +1525,8 @@ struct hci_rp_le_read_resolv_list_size { __u8 size; } __packed; +#define HCI_OP_LE_SET_ADDR_RESOLV_ENABLE 0x202d + #define HCI_OP_LE_READ_MAX_DATA_LEN 0x202f struct hci_rp_le_read_max_data_len { __u8 status; @@ -2176,6 +2179,8 @@ struct hci_evt_le_ext_adv_set_term { __u8 num_evts; } __packed; +#define HCI_EV_VENDOR 0xff + /* Internal events generated by Bluetooth stack */ #define HCI_EV_STACK_INTERNAL 0xfd struct hci_ev_stack_internal { |