diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2020-11-13 16:44:33 -0800 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2020-12-07 17:00:29 +0200 |
| commit | a76a0d365077711594ce200a9553ed6d1ff40276 (patch) | |
| tree | 41e8a7d8e4984a9a5ebd5979e825246f393ebfb0 /net/bluetooth | |
| parent | 5b8ec15d02f12148ef0185825217162b3bc341f4 (diff) | |
| download | linux-stable-a76a0d365077711594ce200a9553ed6d1ff40276.tar.gz linux-stable-a76a0d365077711594ce200a9553ed6d1ff40276.tar.bz2 linux-stable-a76a0d365077711594ce200a9553ed6d1ff40276.zip | |
Bluetooth: Fix not sending Set Extended Scan Response
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>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_request.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c index 048d4db9d4ea..a1d81ef5e42d 100644 --- a/net/bluetooth/hci_request.c +++ b/net/bluetooth/hci_request.c @@ -1056,9 +1056,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; } @@ -1606,14 +1607,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)) |