diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-24 22:24:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-24 22:24:20 +0100 |
| commit | f9e154a0e6730218c222d95af22784b0a53e3f58 (patch) | |
| tree | 88a78cceacfced7e114dd27f05d0e97de2baf2e1 /include | |
| parent | net sched filters: fix filter handle ID in tfilter_notify_chain() (diff) | |
| parent | Bluetooth: Fix using the correct source address type (diff) | |
| download | linux-f9e154a0e6730218c222d95af22784b0a53e3f58.tar.xz linux-f9e154a0e6730218c222d95af22784b0a53e3f58.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2016-11-23
Sorry about the late pull request for 4.9, but we have one more
important Bluetooth patch that should make it to the release. It fixes
connection creation for Bluetooth LE controllers that do not have a
public address (only a random one).
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, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index f00bf667ec33..554671c81f4a 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1018,7 +1018,7 @@ static inline void hci_set_drvdata(struct hci_dev *hdev, void *data) } struct hci_dev *hci_dev_get(int index); -struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src); +struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, u8 src_type); struct hci_dev *hci_alloc_dev(void); void hci_free_dev(struct hci_dev *hdev); |