diff options
| author | Andre Guedes | 2014-02-27 00:21:44 +0100 |
|---|---|---|
| committer | Marcel Holtmann | 2014-02-27 04:41:34 +0100 |
| commit | 04a6c5898e8cbb46313b7d425001b701f0fa4e3d (patch) | |
| tree | 33193eddde45abfa9683b1daea8be4ae9d761a3c /net/bluetooth/l2cap_core.c | |
| parent | Bluetooth: Remove unused function (diff) | |
| download | kernel-qcow2-linux-04a6c5898e8cbb46313b7d425001b701f0fa4e3d.tar.gz kernel-qcow2-linux-04a6c5898e8cbb46313b7d425001b701f0fa4e3d.tar.xz kernel-qcow2-linux-04a6c5898e8cbb46313b7d425001b701f0fa4e3d.zip | |
Bluetooth: Refactor HCI connection code
hci_connect() is a very simple and useless wrapper of hci_connect_acl
and hci_connect_le functions. Addtionally, all places where hci_connect
is called the link type value is passed explicitly. This way, we can
safely delete hci_connect, declare hci_connect_acl and hci_connect_le
in hci_core.h and call them directly.
No functionality is changed by this patch.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index d8d990215158..ab5e2bd113ed 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -7109,11 +7109,10 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, auth_type = l2cap_get_auth_type(chan); if (bdaddr_type_is_le(dst_type)) - hcon = hci_connect(hdev, LE_LINK, dst, dst_type, - chan->sec_level, auth_type); + hcon = hci_connect_le(hdev, dst, dst_type, chan->sec_level, + auth_type); else - hcon = hci_connect(hdev, ACL_LINK, dst, dst_type, - chan->sec_level, auth_type); + hcon = hci_connect_acl(hdev, dst, chan->sec_level, auth_type); if (IS_ERR(hcon)) { err = PTR_ERR(hcon); |