diff options
-rw-r--r-- | include/net/bluetooth/hci_core.h | 2 | ||||
-rw-r--r-- | net/bluetooth/hci_core.c | 30 |
2 files changed, 0 insertions, 32 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 5de7eb95ef63..f77885ea78c2 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -1210,8 +1210,6 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, | |||
1210 | u16 latency, u16 to_multiplier); | 1210 | u16 latency, u16 to_multiplier); |
1211 | void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8], | 1211 | void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8], |
1212 | __u8 ltk[16]); | 1212 | __u8 ltk[16]); |
1213 | int hci_do_inquiry(struct hci_dev *hdev, u8 length); | ||
1214 | int hci_cancel_inquiry(struct hci_dev *hdev); | ||
1215 | 1213 | ||
1216 | u8 bdaddr_to_le(u8 bdaddr_type); | 1214 | u8 bdaddr_to_le(u8 bdaddr_type); |
1217 | 1215 | ||
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 100539fcbfe5..e2e9d409d0f6 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -3501,36 +3501,6 @@ static void hci_cmd_work(struct work_struct *work) | |||
3501 | } | 3501 | } |
3502 | } | 3502 | } |
3503 | 3503 | ||
3504 | int hci_do_inquiry(struct hci_dev *hdev, u8 length) | ||
3505 | { | ||
3506 | /* General inquiry access code (GIAC) */ | ||
3507 | u8 lap[3] = { 0x33, 0x8b, 0x9e }; | ||
3508 | struct hci_cp_inquiry cp; | ||
3509 | |||
3510 | BT_DBG("%s", hdev->name); | ||
3511 | |||
3512 | if (test_bit(HCI_INQUIRY, &hdev->flags)) | ||
3513 | return -EINPROGRESS; | ||
3514 | |||
3515 | hci_inquiry_cache_flush(hdev); | ||
3516 | |||
3517 | memset(&cp, 0, sizeof(cp)); | ||
3518 | memcpy(&cp.lap, lap, sizeof(cp.lap)); | ||
3519 | cp.length = length; | ||
3520 | |||
3521 | return hci_send_cmd(hdev, HCI_OP_INQUIRY, sizeof(cp), &cp); | ||
3522 | } | ||
3523 | |||
3524 | int hci_cancel_inquiry(struct hci_dev *hdev) | ||
3525 | { | ||
3526 | BT_DBG("%s", hdev->name); | ||
3527 | |||
3528 | if (!test_bit(HCI_INQUIRY, &hdev->flags)) | ||
3529 | return -EALREADY; | ||
3530 | |||
3531 | return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL); | ||
3532 | } | ||
3533 | |||
3534 | u8 bdaddr_to_le(u8 bdaddr_type) | 3504 | u8 bdaddr_to_le(u8 bdaddr_type) |
3535 | { | 3505 | { |
3536 | switch (bdaddr_type) { | 3506 | switch (bdaddr_type) { |