diff options
| author |   Andre Guedes <andre.guedes@openbossa.org> | 2014-02-26 20:21:44 -0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-02-26 19:41:34 -0800 |
| commit | 04a6c5898e8cbb46313b7d425001b701f0fa4e3d (patch) | |
| tree | 33193eddde45abfa9683b1daea8be4ae9d761a3c /net/bluetooth/mgmt.c | |
| parent | Bluetooth: Remove unused function (diff) | |
| download | linux-dev-04a6c5898e8cbb46313b7d425001b701f0fa4e3d.tar.xz linux-dev-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/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index cfcaf97c998b..9fc7c1d9fcbb 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -2816,11 +2816,11 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, auth_type = HCI_AT_DEDICATED_BONDING_MITM; if (cp->addr.type == BDADDR_BREDR) - conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr, - cp->addr.type, sec_level, auth_type); + conn = hci_connect_acl(hdev, &cp->addr.bdaddr, sec_level, + auth_type); else - conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr, - cp->addr.type, sec_level, auth_type); + conn = hci_connect_le(hdev, &cp->addr.bdaddr, cp->addr.type, + sec_level, auth_type); if (IS_ERR(conn)) { int status; |