diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-20 18:24:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-20 18:24:22 -0400 |
| commit | 2c71ab4bb465c79a4687cc2fd5012e470aebdb1f (patch) | |
| tree | be9407da61256ff3cc17219f2f8acc45297bfdd0 /include | |
| parent | f0b99e3ab323c72c480140532b0526f087a08c23 (diff) | |
| parent | df2445bf77833674ebf790d2e6fcfd1d389b8a7b (diff) | |
| download | linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.tar.gz linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.tar.bz2 linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.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-05-18
Here's the first bluetooth-next pull request for the 4.18 kernel:
- Refactoring of the btbcm driver
- New USB IDs for QCA_ROME and LiteOn controllers
- Buffer overflow fix if the controller sends invalid advertising data length
- Various cleanups & fixes for Qualcomm controllers
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index b619a190ff12..893bbbb5d2fa 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1393,6 +1393,8 @@ struct sk_buff *__hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen, const void *param, u32 timeout); struct sk_buff *__hci_cmd_sync_ev(struct hci_dev *hdev, u16 opcode, u32 plen, const void *param, u8 event, u32 timeout); +int __hci_cmd_send(struct hci_dev *hdev, u16 opcode, u32 plen, + const void *param); int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, const void *param); |