diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2012-03-15 15:52:08 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-08 23:41:33 -0400 |
commit | c9ecc48e2f3577a73dcd830d8b67ecc48e224465 (patch) | |
tree | 8aafa2620851fda2235b11fa6c8c98e38ab709bc /net/bluetooth/mgmt.c | |
parent | 7dbfac1d720d3ea68e00e187bbd2f1147257528b (diff) |
Bluetooth: LE support for MGMT stop discovery
This patch adds LE support to MGMT stop discovery command. So,
now we are able to cancel LE discovery procedures (LE-only and
interleaved).
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 0ef4b6ca6e44..5fc741bab2bf 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -2404,7 +2404,11 @@ static int stop_discovery(struct sock *sk, struct hci_dev *hdev, void *data, | |||
2404 | } | 2404 | } |
2405 | 2405 | ||
2406 | if (hdev->discovery.state == DISCOVERY_FINDING) { | 2406 | if (hdev->discovery.state == DISCOVERY_FINDING) { |
2407 | err = hci_cancel_inquiry(hdev); | 2407 | if (test_bit(HCI_INQUIRY, &hdev->flags)) |
2408 | err = hci_cancel_inquiry(hdev); | ||
2409 | else | ||
2410 | err = hci_cancel_le_scan(hdev); | ||
2411 | |||
2408 | if (err < 0) | 2412 | if (err < 0) |
2409 | mgmt_pending_remove(cmd); | 2413 | mgmt_pending_remove(cmd); |
2410 | else | 2414 | else |