Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 177d0506 authored by Wesley Kuo's avatar Wesley Kuo Committed by Marcel Holtmann
Browse files

Bluetooth: Fix remote name event return directly. 



This patch fixes hci_remote_name_evt dose not resolve name during
discovery status is RESOLVING. Before simultaneous dual mode scan enabled,
hci_check_pending_name will set discovery status to STOPPED eventually.

Signed-off-by: default avatarWesley Kuo <wesley.kuo@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent ec0810d2

net/bluetooth/hci_core.c

+4 −2
Original line number Diff line number Diff line
@@ -2854,9 +2854,11 @@ static void le_scan_disable_work_complete(struct hci_dev *hdev, u8 status, 
			 * state. If we were running both LE and BR/EDR inquiry

			 * simultaneously, and BR/EDR inquiry is already

			 * finished, stop discovery, otherwise BR/EDR inquiry

			 * will stop discovery when finished.

			 * will stop discovery when finished. If we will resolve

			 * remote device name, do not change discovery state.

			 */

			if (!test_bit(HCI_INQUIRY, &hdev->flags))

			if (!test_bit(HCI_INQUIRY, &hdev->flags) &&

			    hdev->discovery.state != DISCOVERY_RESOLVING)

				hci_discovery_set_state(hdev,

							DISCOVERY_STOPPED);

		} else {