summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-04-29 19:35:36 +0300
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-06-23 00:23:47 +0100
commitf224ca5fc207a9957164e6f42ec6766da0f55d54 (patch)
treeb85e166ab7aa84baf1ab948274c9161b911decea /net/bluetooth
parent073d1cf35fe45d89f5a553c21eea18b504dd6937 (diff)
downloadop-kernel-dev-f224ca5fc207a9957164e6f42ec6766da0f55d54.zip
op-kernel-dev-f224ca5fc207a9957164e6f42ec6766da0f55d54.tar.gz
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/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index c87f8f9..2939829 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
OpenPOWER on IntegriCloud