diff options
| author | Andre Guedes | 2012-03-21 04:03:37 +0100 |
|---|---|---|
| committer | Gustavo Padovan | 2012-05-09 05:41:34 +0200 |
| commit | 642be6c768bd686577ffe6ebcc5e6132a932537b (patch) | |
| tree | 74d65aaac3cb9ef55c7ac33ccc22ba719839b37d /net/bluetooth/mgmt.c | |
| parent | Bluetooth: Add HCI_PERIODIC_INQ to dev_flags (diff) | |
| download | kernel-qcow2-linux-642be6c768bd686577ffe6ebcc5e6132a932537b.tar.gz kernel-qcow2-linux-642be6c768bd686577ffe6ebcc5e6132a932537b.tar.xz kernel-qcow2-linux-642be6c768bd686577ffe6ebcc5e6132a932537b.zip | |
Bluetooth: Check HCI_PERIODIC_INQ in start_discovery
This patch adds a HCI_PERIODIC_INQ check to start_discovery.
If periodic inquiry is enabled, we fail MGMT Start Discovery
command with MGMT_STATUS_BUSY code.
Signed-off-by: Andre Guedes <aguedespe@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 2975a10fca07..4bb0a130e7d9 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -2315,6 +2315,12 @@ static int start_discovery(struct sock *sk, struct hci_dev *hdev, goto failed; } + if (test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags)) { + err = cmd_status(sk, hdev->id, MGMT_OP_START_DISCOVERY, + MGMT_STATUS_BUSY); + goto failed; + } + if (hdev->discovery.state != DISCOVERY_STOPPED) { err = cmd_status(sk, hdev->id, MGMT_OP_START_DISCOVERY, MGMT_STATUS_BUSY); |