Commit 642be6c7 authored Mar 21, 2012 by Andre Guedes Committed by Gustavo Padovan May 09, 2012

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>

parent ae854a70

net/bluetooth/mgmt.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);