Commit 7a135109 authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo F. Padovan
Browse files

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: default avatarAndre Guedes <andre.guedes@openbossa.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 4d611e4d

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, 
int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

				u8 addr_type, u8 *dev_class, s8 rssi, u8 *eir);

int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *name);

int mgmt_inquiry_failed(struct hci_dev *hdev, u8 status);

int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status);

int mgmt_discovering(struct hci_dev *hdev, u8 discovering);

int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr);

int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr);

net/bluetooth/hci_event.c

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) 
		hci_conn_check_pending(hdev);

		hci_dev_lock(hdev);

		if (test_bit(HCI_MGMT, &hdev->flags))

			mgmt_inquiry_failed(hdev, status);

			mgmt_start_discovery_failed(hdev, status);

		hci_dev_unlock(hdev);

		return;

	}

net/bluetooth/mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -2428,7 +2428,7 @@ int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *name) 
	return mgmt_event(MGMT_EV_REMOTE_NAME, hdev, &ev, sizeof(ev), NULL);

}



int mgmt_inquiry_failed(struct hci_dev *hdev, u8 status)

int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status)

{

	struct pending_cmd *cmd;

	int err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE