diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2011-11-09 15:14:26 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-11-16 12:40:30 -0500 |
commit | e6d465cb482935c26cb4065a6ab9ce987c067da3 (patch) | |
tree | ea027e48cb8347f860cec32ae3b66287bd943502 /net/bluetooth/mgmt.c | |
parent | 7a13510902c81ad865f6d02aed2f4e053a46050e (diff) |
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: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 9fdea980be98..bd77f54d91f7 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -2443,6 +2443,21 @@ int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status) | |||
2443 | return err; | 2443 | return err; |
2444 | } | 2444 | } |
2445 | 2445 | ||
2446 | int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status) | ||
2447 | { | ||
2448 | struct pending_cmd *cmd; | ||
2449 | int err; | ||
2450 | |||
2451 | cmd = mgmt_pending_find(MGMT_OP_STOP_DISCOVERY, hdev); | ||
2452 | if (!cmd) | ||
2453 | return -ENOENT; | ||
2454 | |||
2455 | err = cmd_status(cmd->sk, hdev->id, cmd->opcode, status); | ||
2456 | mgmt_pending_remove(cmd); | ||
2457 | |||
2458 | return err; | ||
2459 | } | ||
2460 | |||
2446 | int mgmt_discovering(struct hci_dev *hdev, u8 discovering) | 2461 | int mgmt_discovering(struct hci_dev *hdev, u8 discovering) |
2447 | { | 2462 | { |
2448 | struct pending_cmd *cmd; | 2463 | struct pending_cmd *cmd; |