diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-09 00:19:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-09 00:19:15 +0300 |
| commit | 4c7c12e0c9b8224170afd974eed9ea032bd7f453 (patch) | |
| tree | 06bc4f87b29df96d9a7a7219b192b5a994c5af21 /include/net/bluetooth | |
| parent | fc56be47da8cb111add373c36230b0139139898f (diff) | |
| parent | 082f2300cfa1a3d9d5221c38c5eba85d4ab98bd8 (diff) | |
| download | linux-4c7c12e0c9b8224170afd974eed9ea032bd7f453.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2018-04-08
Here's one important Bluetooth fix for the 4.17-rc series that's needed
to pass several Bluetooth qualification test cases.
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')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 95ccc1eef558..b619a190ff12 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -895,7 +895,7 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst, u16 conn_timeout); struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, u8 dst_type, u8 sec_level, u16 conn_timeout, - u8 role); + u8 role, bdaddr_t *direct_rpa); struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst, u8 sec_level, u8 auth_type); struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst, |