diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2011-11-09 15:14:25 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-11-16 12:40:19 -0500 |
commit | 7a13510902c81ad865f6d02aed2f4e053a46050e (patch) | |
tree | 6c3f9b2975a7389380592bd907adad7be4506f47 | |
parent | 4d611e4d3dc78efcba514d235b5f0a6df0828372 (diff) |
Bluetooth: Rename mgmt_inquiry_failed()
This patch renames the function mgmt_inquiry_failed() to
mgmt_start_discovery_failed(). This function is more related
to MGMT_OP_START_DISCOVERY command handling than to inquiry.
Besides, this functions will be reused by LE based discovery
procedures in case of failure.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
-rw-r--r-- | include/net/bluetooth/hci_core.h | 2 | ||||
-rw-r--r-- | net/bluetooth/hci_event.c | 2 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index a67ff88dcb2..827bedab6a7 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -940,7 +940,7 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, | |||
940 | int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 940 | int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
941 | u8 addr_type, u8 *dev_class, s8 rssi, u8 *eir); | 941 | u8 addr_type, u8 *dev_class, s8 rssi, u8 *eir); |
942 | int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *name); | 942 | int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *name); |
943 | int mgmt_inquiry_failed(struct hci_dev *hdev, u8 status); | 943 | int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status); |
944 | int mgmt_discovering(struct hci_dev *hdev, u8 discovering); | 944 | int mgmt_discovering(struct hci_dev *hdev, u8 discovering); |
945 | int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr); | 945 | int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr); |
946 | int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr); | 946 | int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr); |
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0d55d00596d..53b2071adfa 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -1014,7 +1014,7 @@ static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) | |||
1014 | hci_conn_check_pending(hdev); | 1014 | hci_conn_check_pending(hdev); |
1015 | hci_dev_lock(hdev); | 1015 | hci_dev_lock(hdev); |
1016 | if (test_bit(HCI_MGMT, &hdev->flags)) | 1016 | if (test_bit(HCI_MGMT, &hdev->flags)) |
1017 | mgmt_inquiry_failed(hdev, status); | 1017 | mgmt_start_discovery_failed(hdev, status); |
1018 | hci_dev_unlock(hdev); | 1018 | hci_dev_unlock(hdev); |
1019 | return; | 1019 | return; |
1020 | } | 1020 | } |
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 5562c2106eb..9fdea980be9 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -2428,7 +2428,7 @@ int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *name) | |||
2428 | return mgmt_event(MGMT_EV_REMOTE_NAME, hdev, &ev, sizeof(ev), NULL); | 2428 | return mgmt_event(MGMT_EV_REMOTE_NAME, hdev, &ev, sizeof(ev), NULL); |
2429 | } | 2429 | } |
2430 | 2430 | ||
2431 | int mgmt_inquiry_failed(struct hci_dev *hdev, u8 status) | 2431 | int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status) |
2432 | { | 2432 | { |
2433 | struct pending_cmd *cmd; | 2433 | struct pending_cmd *cmd; |
2434 | int err; | 2434 | int err; |