diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-01-27 11:24:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-27 11:24:46 +0100 |
| commit | c4c57b974d27f53744b1bc5669e002f080cec839 (patch) | |
| tree | ac0fd57c1445762dffb69d2c5830e5e77b1770a5 /include/net/bluetooth/hci_mon.h | |
| parent | drivers: net: xgene: Fix the order of the arguments of 'alloc_etherdev_mqs()' (diff) | |
| parent | Bluetooth: Fix race condition in hci_release_sock() (diff) | |
| download | linux-dev-c4c57b974d27f53744b1bc5669e002f080cec839.tar.xz linux-dev-c4c57b974d27f53744b1bc5669e002f080cec839.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 2020-01-26
Here's (probably) the last bluetooth-next pull request for the 5.6 kernel.
- Initial pieces of Bluetooth 5.2 Isochronous Channels support
- mgmt: Various cleanups and a new Set Blocked Keys command
- btusb: Added support for 04ca:3021 QCA_ROME device
- hci_qca: Multiple fixes & cleanups
- hci_bcm: Fixes & improved device tree support
- Fixed attempts to create duplicate debugfs entries
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/bluetooth/hci_mon.h')
| -rw-r--r-- | include/net/bluetooth/hci_mon.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_mon.h b/include/net/bluetooth/hci_mon.h index 240786b04a46..2d5fcda1bcd0 100644 --- a/include/net/bluetooth/hci_mon.h +++ b/include/net/bluetooth/hci_mon.h @@ -49,6 +49,8 @@ struct hci_mon_hdr { #define HCI_MON_CTRL_CLOSE 15 #define HCI_MON_CTRL_COMMAND 16 #define HCI_MON_CTRL_EVENT 17 +#define HCI_MON_ISO_TX_PKT 18 +#define HCI_MON_ISO_RX_PKT 19 struct hci_mon_new_index { __u8 type; |