diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-24 16:24:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-24 16:24:20 -0500 |
| commit | f9e154a0e6730218c222d95af22784b0a53e3f58 (patch) | |
| tree | 88a78cceacfced7e114dd27f05d0e97de2baf2e1 /net/bluetooth/rfcomm/tty.c | |
| parent | 19a8bb28d1c66670a2aebf9c78ec21c0b942f4b8 (diff) | |
| parent | 39385cb5f3274735b03ed1f8e7ff517b02a0beed (diff) | |
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 'net/bluetooth/rfcomm/tty.c')
| -rw-r--r-- | net/bluetooth/rfcomm/tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 8e385a0ae60e..2f2cb5e27cdd 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c @@ -178,7 +178,7 @@ static void rfcomm_reparent_device(struct rfcomm_dev *dev) struct hci_dev *hdev; struct hci_conn *conn; - hdev = hci_get_route(&dev->dst, &dev->src); + hdev = hci_get_route(&dev->dst, &dev->src, BDADDR_BREDR); if (!hdev) return; |