Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d465cb authored by Andre Guedes's avatar Andre Guedes Committed by Gustavo Padovan
Browse files

Bluetooth: mgmt_stop_discovery_failed() 



This patches creates mgmt_stop_discovery_failed() which removes
pending MGMT_OP_STOP_DISCOVERY commands and sends proper command
status events.

This patch also fixes the MGMT_OP_STOP_DISCOVERY command leak in
case cancel inquiry fails.

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 7a135109

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -941,6 +941,7 @@ 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_start_discovery_failed(struct hci_dev *hdev, u8 status);

int mgmt_stop_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

+5 −1
Original line number Diff line number Diff line
@@ -55,8 +55,12 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb) 


	BT_DBG("%s status 0x%x", hdev->name, status);



	if (status)

	if (status) {

		hci_dev_lock(hdev);

		mgmt_stop_discovery_failed(hdev, status);

		hci_dev_unlock(hdev);

		return;

	}



	clear_bit(HCI_INQUIRY, &hdev->flags);

net/bluetooth/mgmt.c

+15 −0
Original line number Diff line number Diff line
@@ -2443,6 +2443,21 @@ int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status) 
	return err;

}



int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status)

{

	struct pending_cmd *cmd;

	int err;



	cmd = mgmt_pending_find(MGMT_OP_STOP_DISCOVERY, hdev);

	if (!cmd)

		return -ENOENT;



	err = cmd_status(cmd->sk, hdev->id, cmd->opcode, status);

	mgmt_pending_remove(cmd);



	return err;

}



int mgmt_discovering(struct hci_dev *hdev, u8 discovering)

{

	struct pending_cmd *cmd;