bluetooth: LE conn whitelist implementation
Add support to create connection to LE devices using
whitelist. With this, the Controller can try to connect
to multiple devices at the same time. The following
interfaces are added.
1. Add/Remove device from whitelist
2. Clear all the devices from whitelist
3. Create Connection to devices from whitelist
4. Cancel create connection to whitelist devices
CRs-fixed: 388980
Change-Id: I3900c71255e754f80bb2873ae19a41b94cca76c3
Signed-off-by: Sunny Kapdi <sunnyk@codeaurora.org>
(cherry picked from commit 93bef895b01b79f49af60ba1394c9c3f6e563212)
(cherry picked from commit 377ee2bf1fc37bcbeae872661646bdd6a5f8da31)
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 963ef48..879c68b 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -50,7 +50,7 @@
bdaddr_t *dst, __u8 sec_level, __u8 auth_type,
struct bt_le_params *le_params)
{
- struct hci_conn *le;
+ struct hci_conn *le, *le_wlist_conn;
struct hci_cp_le_create_conn cp;
struct adv_entry *entry;
struct link_key *key;
@@ -59,8 +59,21 @@
le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
if (le) {
- hci_conn_hold(le);
- return le;
+ le_wlist_conn = hci_conn_hash_lookup_ba(hdev, LE_LINK,
+ BDADDR_ANY);
+ if (!le_wlist_conn) {
+ hci_conn_hold(le);
+ return le;
+ } else {
+ BT_DBG("remove wlist conn");
+ le->out = 1;
+ le->link_mode |= HCI_LM_MASTER;
+ le->sec_level = BT_SECURITY_LOW;
+ le->type = LE_LINK;
+ hci_proto_connect_cfm(le, 0);
+ hci_conn_del(le_wlist_conn);
+ return le;
+ }
}
key = hci_find_link_key_type(hdev, dst, KEY_TYPE_LTK);
@@ -107,8 +120,13 @@
cp.conn_latency = cpu_to_le16(BT_LE_LATENCY_DEF);
le->conn_timeout = 5;
}
- bacpy(&cp.peer_addr, &le->dst);
- cp.peer_addr_type = le->dst_type;
+ if (!bacmp(&le->dst, BDADDR_ANY)) {
+ cp.filter_policy = 0x01;
+ le->conn_timeout = 0;
+ } else {
+ bacpy(&cp.peer_addr, &le->dst);
+ cp.peer_addr_type = le->dst_type;
+ }
hci_send_cmd(hdev, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp);
@@ -121,6 +139,73 @@
hci_send_cmd(conn->hdev, HCI_OP_LE_CREATE_CONN_CANCEL, 0, NULL);
}
+void hci_le_cancel_create_connect(struct hci_dev *hdev, bdaddr_t *dst)
+{
+ struct hci_conn *le;
+
+ BT_DBG("%p", hdev);
+
+ le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
+ if (le) {
+ BT_DBG("send hci connect cancel");
+ hci_le_connect_cancel(le);
+ hci_conn_del(le);
+ }
+}
+EXPORT_SYMBOL(hci_le_cancel_create_connect);
+
+void hci_le_add_dev_white_list(struct hci_dev *hdev, bdaddr_t *dst)
+{
+ struct hci_cp_le_add_dev_white_list cp;
+ struct adv_entry *entry;
+ struct link_key *key;
+
+ BT_DBG("%p", hdev);
+
+ memset(&cp, 0, sizeof(cp));
+ bacpy(&cp.addr, dst);
+
+ key = hci_find_link_key_type(hdev, dst, KEY_TYPE_LTK);
+ if (!key) {
+ entry = hci_find_adv_entry(hdev, dst);
+ if (entry)
+ cp.addr_type = entry->bdaddr_type;
+ else
+ cp.addr_type = 0x00;
+ } else {
+ cp.addr_type = key->addr_type;
+ }
+
+ hci_send_cmd(hdev, HCI_OP_LE_ADD_DEV_WHITE_LIST, sizeof(cp), &cp);
+}
+EXPORT_SYMBOL(hci_le_add_dev_white_list);
+
+void hci_le_remove_dev_white_list(struct hci_dev *hdev, bdaddr_t *dst)
+{
+ struct hci_cp_le_remove_dev_white_list cp;
+ struct adv_entry *entry;
+ struct link_key *key;
+
+ BT_DBG("%p", hdev);
+
+ memset(&cp, 0, sizeof(cp));
+ bacpy(&cp.addr, dst);
+
+ key = hci_find_link_key_type(hdev, dst, KEY_TYPE_LTK);
+ if (!key) {
+ entry = hci_find_adv_entry(hdev, dst);
+ if (entry)
+ cp.addr_type = entry->bdaddr_type;
+ else
+ cp.addr_type = 0x00;
+ } else {
+ cp.addr_type = key->addr_type;
+ }
+
+ hci_send_cmd(hdev, HCI_OP_LE_REMOVE_DEV_WHITE_LIST, sizeof(cp), &cp);
+}
+EXPORT_SYMBOL(hci_le_remove_dev_white_list);
+
void hci_acl_connect(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;