projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d06b50c) | patch
Bluetooth: Fix merge of advertising data and scan response data
authorMarcel Holtmann <marcel@holtmann.org>
Tue, 1 Jul 2014 12:11:19 +0000 (14:11 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 3 Jul 2014 15:42:53 +0000 (17:42 +0200)
commit42bd6a56ed1ab4b2cb50f4d4e674874da9b47f46
tree66142667ee8e1ce3ef4c74b6c7b7d5123f6c6ea8tree | snapshot
parentd06b50ce14119acb04773a9808ccff5d1767b7e4commit | diff
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
net/bluetooth/hci_event.c diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git