redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Bluetooth: Simplify a the connection type handling

Browse source 
Now that we have separate ways of doing connections for each link type,
we can do better than an "if" statement to handle each link type.

Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
This commit is contained in:
Vinicius Costa Gomes 2012-07-27 19:32:59 -03:00 committed by Gustavo Padovan
parent b7d839bfff
commit 4cd2d98340
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/bluetooth/hci_conn.c
View file

@ -568,13 +568,16 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
{ {
BT_DBG("%s dst %s", hdev->name, batostr(dst)); BT_DBG("%s dst %s", hdev->name, batostr(dst));
if (type == LE_LINK) switch (type) {
case LE_LINK:
return hci_connect_le(hdev, dst, dst_type, sec_level, auth_type); return hci_connect_le(hdev, dst, dst_type, sec_level, auth_type);
case ACL_LINK:
if (type == ACL_LINK)
return hci_connect_acl(hdev, dst, sec_level, auth_type); return hci_connect_acl(hdev, dst, sec_level, auth_type);
case SCO_LINK:
return hci_connect_sco(hdev, dst, sec_level, auth_type);
}
return hci_connect_sco(hdev, dst, sec_level, auth_type); return ERR_PTR(-EINVAL);
} }
/* Check link security requirement */ /* Check link security requirement */