OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d06b50c
)
Bluetooth: Fix merge of advertising data and scan response data
author
Marcel Holtmann
<marcel@holtmann.org>
Tue, 1 Jul 2014 12:11:19 +0000
(14:11 +0200)
committer
Marcel Holtmann
<marcel@holtmann.org>
Thu, 3 Jul 2014 15:42:53 +0000
(17:42 +0200)
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
net/bluetooth/hci_event.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/hci_event.c
b/net/bluetooth/hci_event.c
index
fe7a54b
..
ea15518
100644
(file)
--- a/
net/bluetooth/hci_event.c
+++ b/
net/bluetooth/hci_event.c
@@
-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);
}