diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-05 13:10:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-05 13:10:36 -0700 |
| commit | 19ab5f40235538fc04d77e0fdb708436b0471f01 (patch) | |
| tree | 72a02a2dae6f41a32920b20e770aca30cbf3fa12 /include | |
| parent | d1f5050b4549fbacd3b3e60126b3bb7270ad8dd1 (diff) | |
| parent | 62a91990f4c52f0b56cfae3e4093a27ed61c49db (diff) | |
| download | linux-stable-19ab5f40235538fc04d77e0fdb708436b0471f01.tar.gz linux-stable-19ab5f40235538fc04d77e0fdb708436b0471f01.tar.bz2 linux-stable-19ab5f40235538fc04d77e0fdb708436b0471f01.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 2019-05-05
Here's one more bluetooth-next pull request for 5.2:
- Fixed Command Complete event handling check for matching opcode
- Added support for Qualcomm WCN3998 controller, along with DT bindings
- Added default address for Broadcom BCM2076B1 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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index fbba43e9bef5..9a5330eed794 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -282,6 +282,7 @@ enum { HCI_FORCE_BREDR_SMP, HCI_FORCE_STATIC_ADDR, HCI_LL_RPA_RESOLUTION, + HCI_CMD_PENDING, __HCI_NUM_FLAGS, }; |