From 7fea220e2c95bc01f4c7bb368767f5c2865b1a56 Mon Sep 17 00:00:00 2001 From: Syam Sidhardhan Date: Thu, 12 Apr 2012 20:33:17 +0530 Subject: [PATCH] --- yaml --- r: 306919 b: refs/heads/master c: e10b9969f217c948c5523045f44eba4d3a758ff0 h: refs/heads/master i: 306917: 83330eb71e47aafa76b64a588b74b053cf17647b 306915: fc6178d358993af6af0ef18e493325ee73b6289f 306911: d87cd7f997400d2b6c7d5bc2fb98b9b2002e3c79 v: v3 --- [refs] | 2 +- trunk/include/net/bluetooth/hci_core.h | 1 - trunk/net/bluetooth/hci_conn.c | 16 ---------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 827479629581..f24272bbab68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 422e925b5b4201dc35bd6a647729ccd9440abb59 +refs/heads/master: e10b9969f217c948c5523045f44eba4d3a758ff0 diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h index d1e744f3b9be..e3547ea83619 100644 --- a/trunk/include/net/bluetooth/hci_core.h +++ b/trunk/include/net/bluetooth/hci_core.h @@ -1055,7 +1055,6 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency, u16 to_multiplier); void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8], __u8 ltk[16]); -void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16]); void hci_le_ltk_neg_reply(struct hci_conn *conn); int hci_do_inquiry(struct hci_dev *hdev, u8 length); diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c index a3ee1a929a6c..cae7ec2df7ad 100644 --- a/trunk/net/bluetooth/hci_conn.c +++ b/trunk/net/bluetooth/hci_conn.c @@ -223,22 +223,6 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8], } EXPORT_SYMBOL(hci_le_start_enc); -void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16]) -{ - struct hci_dev *hdev = conn->hdev; - struct hci_cp_le_ltk_reply cp; - - BT_DBG("%p", conn); - - memset(&cp, 0, sizeof(cp)); - - cp.handle = cpu_to_le16(conn->handle); - memcpy(cp.ltk, ltk, sizeof(ltk)); - - hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp); -} -EXPORT_SYMBOL(hci_le_ltk_reply); - void hci_le_ltk_neg_reply(struct hci_conn *conn) { struct hci_dev *hdev = conn->hdev;