mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
Bluetooth: Fix merge of advertising data and scan response data
The advertising data and scan response data are merged in the wrong order. It should be advertsing data first and then scan response data and not the other way around. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Cc: stable@vger.kernel.org # 3.16
This commit is contained in:
parent
d06b50ce14
commit
42bd6a56ed
1 changed files with 2 additions and 2 deletions
|
@ -4270,8 +4270,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
|
|||
* sending a merged device found event.
|
||||
*/
|
||||
mgmt_device_found(hdev, &d->last_adv_addr, LE_LINK,
|
||||
d->last_adv_addr_type, NULL, rssi, 0, 1, data, len,
|
||||
d->last_adv_data, d->last_adv_data_len);
|
||||
d->last_adv_addr_type, NULL, rssi, 0, 1,
|
||||
d->last_adv_data, d->last_adv_data_len, data, len);
|
||||
clear_pending_adv_report(hdev);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue