leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Fix not sending Set Extended Scan Response

Browse Source 
Current code is actually failing on the following tests of mgmt-tester
because get_adv_instance_scan_rsp_len did not account for flags that
cause scan response data to be included resulting in non-scannable
instance when in fact it should be scannable.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2020-11-13 16:44:33 -08:00 committed by Johan Hedberg
parent 5b8ec15d02
commit a76a0d3650
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/bluetooth/hci_request.c
View File

@ -1056,9 +1056,10 @@ static u8 get_adv_instance_scan_rsp_len(struct hci_dev *hdev, u8 instance)
if (!adv_instance) if (!adv_instance)
return 0; return 0;
/* TODO: Take into account the "appearance" and "local-name" flags here. if (adv_instance->flags & MGMT_ADV_FLAG_APPEARANCE ||
* These are currently being ignored as they are not supported. adv_instance->flags & MGMT_ADV_FLAG_LOCAL_NAME)
*/ return 1;
return adv_instance->scan_rsp_len; return adv_instance->scan_rsp_len;
} }
@ -1606,14 +1607,11 @@ void __hci_req_update_scan_rsp_data(struct hci_request *req, u8 instance)
memset(&cp, 0, sizeof(cp)); memset(&cp, 0, sizeof(cp));
/* Extended scan response data doesn't allow a response to be if (instance)
* set if the instance isn't scannable.
*/
if (get_adv_instance_scan_rsp_len(hdev, instance))
len = create_instance_scan_rsp_data(hdev, instance, len = create_instance_scan_rsp_data(hdev, instance,
cp.data); cp.data);
else else
len = 0; len = create_default_scan_rsp_data(hdev, cp.data);
if (hdev->scan_rsp_data_len == len && if (hdev->scan_rsp_data_len == len &&
!memcmp(cp.data, hdev->scan_rsp_data, len)) !memcmp(cp.data, hdev->scan_rsp_data, len))