Bluetooth: Move and rename hci_conn_accept

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bluetooth / hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 6fa909075cebf9c2a88edd7d69327c7afb6c7e0b..e4d4d231fd8af11f6e60faa6b423ce032f7f9687 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1752,42 +1752,6 @@ unlock:
        hci_conn_check_pending(hdev);
 }
 
-void hci_conn_accept(struct hci_conn *conn, int mask)
-{
-       struct hci_dev *hdev = conn->hdev;
-
-       BT_DBG("conn %p", conn);
-
-       conn->state = BT_CONFIG;
-
-       if (!lmp_esco_capable(hdev)) {
-               struct hci_cp_accept_conn_req cp;
-
-               bacpy(&cp.bdaddr, &conn->dst);
-
-               if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER))
-                       cp.role = 0x00; /* Become master */
-               else
-                       cp.role = 0x01; /* Remain slave */
-
-               hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp), &cp);
-       } else /* lmp_esco_capable(hdev)) */ {
-               struct hci_cp_accept_sync_conn_req cp;
-
-               bacpy(&cp.bdaddr, &conn->dst);
-               cp.pkt_type = cpu_to_le16(conn->pkt_type);
-
-               cp.tx_bandwidth   = __constant_cpu_to_le32(0x00001f40);
-               cp.rx_bandwidth   = __constant_cpu_to_le32(0x00001f40);
-               cp.max_latency    = __constant_cpu_to_le16(0xffff);
-               cp.content_format = cpu_to_le16(hdev->voice_setting);
-               cp.retrans_effort = 0xff;
-
-               hci_send_cmd(hdev, HCI_OP_ACCEPT_SYNC_CONN_REQ,
-                            sizeof(cp), &cp);
-       }
-}
-
 static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
 {
        struct hci_ev_conn_request *ev = (void *) skb->data;