This is a note to let you know that I've just added the patch titled
Bluetooth: Fix merge of advertising data and scan response data
to the 3.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bluetooth-fix-merge-of-advertising-data-and-scan-response-data.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 42bd6a56ed1ab4b2cb50f4d4e674874da9b47f46 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Date: Tue, 1 Jul 2014 14:11:19 +0200
Subject: Bluetooth: Fix merge of advertising data and scan response data
From: Marcel Holtmann <marcel@xxxxxxxxxxxx>
commit 42bd6a56ed1ab4b2cb50f4d4e674874da9b47f46 upstream.
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@xxxxxxxxxxxx>
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/bluetooth/hci_event.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4177,8 +4177,8 @@ static void process_adv_report(struct hc
* 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);
}
Patches currently in stable-queue which might be from marcel@xxxxxxxxxxxx are
queue-3.16/bluetooth-fix-using-uninitialized-variable-when-pairing.patch
queue-3.16/bluetooth-fix-tracking-local-ssp-authentication-requirement.patch
queue-3.16/bluetooth-btmrvl-wait-for-host_sleep_enable-event-in-suspend.patch
queue-3.16/bluetooth-never-linger-on-process-exit.patch
queue-3.16/bluetooth-fix-merge-of-advertising-data-and-scan-response-data.patch
queue-3.16/bluetooth-avoid-use-of-session-socket-after-the-session-gets-freed.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html