diff options
| author | Johan Hedberg | 2013-04-29 18:35:36 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2013-06-23 01:23:47 +0200 |
| commit | f224ca5fc207a9957164e6f42ec6766da0f55d54 (patch) | |
| tree | b85e166ab7aa84baf1ab948274c9161b911decea /net | |
| parent | Bluetooth: Rename L2CAP_CID_LE_DATA to L2CAP_CID_ATT (diff) | |
| download | kernel-qcow2-linux-f224ca5fc207a9957164e6f42ec6766da0f55d54.tar.gz kernel-qcow2-linux-f224ca5fc207a9957164e6f42ec6766da0f55d54.tar.xz kernel-qcow2-linux-f224ca5fc207a9957164e6f42ec6766da0f55d54.zip | |
Bluetooth: Fix LE vs BR/EDR selection when connecting
The choice between LE and BR/EDR should be made on the destination
address type instead of the destination CID. This is particularly
important when in the future more than one CID will be allowed for LE.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index c87f8f94083d..29398293d501 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1792,7 +1792,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, auth_type = l2cap_get_auth_type(chan); - if (chan->dcid == L2CAP_CID_ATT) + if (bdaddr_type_is_le(dst_type)) hcon = hci_connect(hdev, LE_LINK, dst, dst_type, chan->sec_level, auth_type); else |