Bluetooth: Fix not sending Set Extended Scan Response
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/2 Bluetooth: Fix not sending Set Extended Scan Response
From: Luiz Augusto von Dentz <[email protected]>
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.
--- net/bluetooth/hci_request.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
net/bluetooth/hci_request.c +6 -8
@@ -1052,9 +1052,10 @@ static u8 get_adv_instance_scan_rsp_len(struct hci_dev *hdev, u8 instance)if (!adv_instance)return 0 ; -/* TODO: Take into account the "appearance" and "local-name" flags here. -* These are currently being ignored as they are not supported. -*/ +if (adv_instance->flags &MGMT_ADV_FLAG_APPEARANCE || + adv_instance->flags &MGMT_ADV_FLAG_LOCAL_NAME ) +return 1 ; +return adv_instance->scan_rsp_len; }
@@ -1591,14 +1592,11 @@ void __hci_req_update_scan_rsp_data(struct hci_request *req, u8 instance)memset (&cp,0 ,sizeof (cp)); -/* Extended scan response data doesn't allow a response to be -* set if the instance isn't scannable. -*/ -if (get_adv_instance_scan_rsp_len (hdev, instance)) +if (instance) len =create_instance_scan_rsp_data (hdev, instance, cp.data);else - len =0 ; + len =create_default_scan_rsp_data (hdev, cp.data);if (hdev->scan_rsp_data_len == len && !memcmp (cp.data, hdev->scan_rsp_data, len))
Signature · 1 line
2.26.2
Luiz Augusto von Dentz
maintainerPATCH 2/2 Bluetooth: Rename get_adv_instance_scan_rsp
From: Luiz Augusto von Dentz <[email protected]>
This renames get_adv_instance_scan_rsp to adv_instance_is_scannable and make it return a bool since it was not actually properly return the size of the scan response as one could expect.
--- net/bluetooth/hci_request.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-)
net/bluetooth/hci_request.c +9 -23
@@ -1040,23 +1040,23 @@ void hci_req_add_le_passive_scan(struct hci_request *req) own_addr_type, filter_policy, addr_resolv); } -static u8 get_adv_instance_scan_rsp_len (struct hci_dev *hdev,u8 instance) +static bool adv_instance_is_scannable (struct hci_dev *hdev,u8 instance) {struct adv_info *adv_instance;/* Instance 0x00 always set local name */ if (instance ==0x00 ) -return 1 ; +return true; adv_instance =hci_find_adv_instance (hdev, instance);if (!adv_instance) -return 0 ; +return false;if (adv_instance->flags &MGMT_ADV_FLAG_APPEARANCE || adv_instance->flags &MGMT_ADV_FLAG_LOCAL_NAME ) -return 1 ; +return true; -return adv_instance->scan_rsp_len; +return adv_instance->scan_rsp_len ? true : false; }static void hci_req_clear_event_filter (struct hci_request *req)
@@ -1301,23 +1301,9 @@ void hci_req_prepare_suspend(struct hci_dev *hdev, enum suspended_state next)wake_up (&hdev->suspend_wait_q); } -static u8 get_cur_adv_instance_scan_rsp_len (struct hci_dev *hdev) +static bool adv_cur_instance_is_scannable (struct hci_dev *hdev) { -u8 instance = hdev->cur_adv_instance; -struct adv_info *adv_instance; - -/* Instance 0x00 always set local name */ -if (instance ==0x00 ) -return 1 ; - - adv_instance =hci_find_adv_instance (hdev, instance); -if (!adv_instance) -return 0 ; - -/* TODO: Take into account the "appearance" and "local-name" flags here. -* These are currently being ignored as they are not supported. -*/ -return adv_instance->scan_rsp_len; +return adv_instance_is_scannable (hdev, hdev->cur_adv_instance); }void __hci_req_disable_advertising (struct hci_request *req)
@@ -1473,7 +1459,7 @@ void __hci_req_enable_advertising(struct hci_request *req) adv_min_interval = hdev->le_adv_min_interval; adv_max_interval = hdev->le_adv_max_interval; }else { -if (get_cur_adv_instance_scan_rsp_len (hdev)) +if (adv_cur_instance_is_scannable (hdev)) cp.type =LE_ADV_SCAN_IND ;else cp.type =LE_ADV_NONCONN_IND ;
@@ -2015,7 +2001,7 @@ int __hci_req_setup_ext_adv_instance(struct hci_request *req, u8 instance) cp.evt_properties =cpu_to_le16 (LE_EXT_ADV_CONN_IND ); else cp.evt_properties = cpu_to_le16(LE_LEGACY_ADV_IND); - }else if (get_adv_instance_scan_rsp_len (hdev, instance)) { + }else if (adv_instance_is_scannable (hdev, instance)) {if (secondary_adv) cp.evt_properties =cpu_to_le16 (LE_EXT_ADV_SCAN_IND );else
Signature · 1 line
2.26.2
Marcel Holtmann
maintainerRe: [PATCH 2/2] Bluetooth: Rename get_adv_instance_scan_rsp
Hi Luiz,
Quoted 8 lines
This renames
get_adv_instance_scan_rsptoadv_instance_is_scannableand make it return a bool since it was not actually properly return the size of the scan response as one could expect.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
net/bluetooth/hci_request.c| 32 +++++++++-----------------------1 file changed, 9 insertions(+), 23 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=384043
---Test result---
##############################
Test: CheckPatch - FAIL
Output:
workflow: Add workflow files for ci
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #18:
new file mode 100644
ERROR: Missing Signed-off-by: line(s)
total: 1 errors, 1 warnings, 49 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
"[PATCH] workflow: Add workflow files for ci" has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: CheckGitLint - PASS
##############################
Test: CheckBuildK - PASS
---
Regards,
Linux Bluetooth
Marcel Holtmann
maintainerHi Luiz,
Quoted 9 lines
Current code is actually failing on the following tests of mgmt-tester because
get_adv_instance_scan_rsp_lendid 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 <[email protected]>---
net/bluetooth/hci_request.c| 14 ++++++--------1 file changed, 6 insertions(+), 8 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel