FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-20 00:11:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bluetooth: Clear discovery filter before starting background scan

Browse Source 
Currently the discovery filter information are only cleared when the
actual discovery procedure has been stopped. To make sure that none
of the filters interfere with the background scanning and its device
found event reporting, clear the filter before starting background
scanning.

This means that the discovery filter is now cleared before either
Start Discovery, Start Service Discovery or background scanning.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2014-12-05 11:45:23 +01:00 committed by Johan Hedberg
parent 22078800c3
commit ee3c3ca5ba
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/bluetooth/hci_core.c
View File

@ -2052,17 +2052,6 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
case DISCOVERY_STOPPED: case DISCOVERY_STOPPED:
hci_update_background_scan(hdev); hci_update_background_scan(hdev);
/* Reset RSSI and UUID filters to ensure Start Discovery
* and Start Service Discovery operate properly no matter
* which one started the previous discovery.
*
* While the Start Discovery and Start Service Discovery
* operations will set proper values for RSSI and UUID
* count, it is important to actually free the allocated
* list of UUIDs here.
*/
hci_discovery_filter_clear(hdev);
if (old_state != DISCOVERY_STARTING) if (old_state != DISCOVERY_STARTING)
mgmt_discovering(hdev, 0); mgmt_discovering(hdev, 0);
break; break;
@ -5679,6 +5668,15 @@ void hci_update_background_scan(struct hci_dev *hdev)
if (hdev->discovery.state != DISCOVERY_STOPPED) if (hdev->discovery.state != DISCOVERY_STOPPED)
return; return;
/* Reset RSSI and UUID filters when starting background scanning
* since these filters are meant for service discovery only.
*
* The Start Discovery and Start Service Discovery operations
* ensure to set proper values for RSSI threshold and UUID
* filter list. So it is safe to just reset them here.
*/
hci_discovery_filter_clear(hdev);
hci_req_init(&req, hdev); hci_req_init(&req, hdev);
if (list_empty(&hdev->pend_le_conns) && if (list_empty(&hdev->pend_le_conns) &&