Commit 80740ebb authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Marcel Holtmann
Browse files

Bluetooth: hci_sync: Fix hci_update_accept_list_sync 



hci_update_accept_list_sync is returning the filter based on the error
but that gets overwritten by hci_le_set_addr_resolution_enable_sync
return instead of using the actual result of the likes of
hci_le_add_accept_list_sync which was intended.

Fixes: ad383c2c ("Bluetooth: hci_sync: Enable advertising when LL privacy is enabled")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 2e8ecb4b

net/bluetooth/hci_sync.c

+4 −1
Original line number Diff line number Diff line
@@ -1841,6 +1841,7 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev) 
	struct bdaddr_list *b, *t;

	u8 num_entries = 0;

	bool pend_conn, pend_report;

	u8 filter_policy;

	int err;



	/* Pause advertising if resolving list can be used as controllers are
@@ -1927,6 +1928,8 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev) 
		err = -EINVAL;



done:

	filter_policy = err ? 0x00 : 0x01;



	/* Enable address resolution when LL Privacy is enabled. */

	err = hci_le_set_addr_resolution_enable_sync(hdev, 0x01);

	if (err)
@@ -1937,7 +1940,7 @@ static u8 hci_update_accept_list_sync(struct hci_dev *hdev) 
		hci_resume_advertising_sync(hdev);



	/* Select filter policy to use accept list */

	return err ? 0x00 : 0x01;

	return filter_policy;

}



/* Returns true if an le connection is in the scanning state */