Bluetooth: Fix merge of advertising data and scan response data

Browse source

commit 42bd6a56ed 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@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Marcel Holtmann 2014-07-01 14:11:19 +02:00 • committed by Greg Kroah-Hartman

parent ec0c2b9cc4

commit 41466215bd

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

net/bluetooth/hci_event.c

View file