Commit 50143a43 authored Jun 10, 2014 by Johan Hedberg Committed by Marcel Holtmann Jun 13, 2014

Bluetooth: Fix indicating discovery state when canceling inquiry



When inquiry is canceled through the HCI_Cancel_Inquiry command there is
no Inquiry Complete event generated. Instead, all we get is the command
complete for the HCI_Inquiry_Cancel command. This means that we must
call the hci_discovery_set_state() function from the respective command
complete handler in order to ensure that user space knows the correct
discovery state.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org

parent fff3490f

net/bluetooth/hci_event.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,10 @@ static void hci_cc_inquiry_cancel(struct hci_dev hdev, struct sk_buff skb)
		smp_mb__after_atomic(); /* wake_up_bit advises about this barrier */
		wake_up_bit(&hdev->flags, HCI_INQUIRY);

		hci_dev_lock(hdev);
		hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
		hci_dev_unlock(hdev);

		hci_conn_check_pending(hdev);
		}