Commit 6cebb9e7 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Enable page scan also if there are white list entries 



Page scan should be enabled either if the connectable setting is set or
if there are any entries in the BR/EDR white list. This patch implements
such behavior by updating the two places that were making decisions on
whether to enable page scan or not.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 70c46425

net/bluetooth/mgmt.c

+4 −2
Original line number Diff line number Diff line
@@ -4357,7 +4357,8 @@ static void set_bredr_scan(struct hci_request *req) 
	 */

	write_fast_connectable(req, false);



	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))

	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags) ||

	    !list_empty(&hdev->whitelist))

		scan |= SCAN_PAGE;

	if (test_bit(HCI_DISCOVERABLE, &hdev->dev_flags))

		scan |= SCAN_INQUIRY;
@@ -4471,7 +4472,8 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 


	hci_req_init(&req, hdev);



	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags))

	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags) ||

	    !list_empty(&hdev->whitelist))

		set_bredr_scan(&req);



	/* Since only the advertising data flags will change, there