diff options
| author | Marcel Holtmann | 2014-07-01 14:11:19 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2014-07-03 17:42:53 +0200 |
| commit | 42bd6a56ed1ab4b2cb50f4d4e674874da9b47f46 (patch) | |
| tree | 66142667ee8e1ce3ef4c74b6c7b7d5123f6c6ea8 /net | |
| parent | Bluetooth: Remove connection interval parameters from hci_conn_params_set (diff) | |
| download | kernel-qcow2-linux-42bd6a56ed1ab4b2cb50f4d4e674874da9b47f46.tar.gz kernel-qcow2-linux-42bd6a56ed1ab4b2cb50f4d4e674874da9b47f46.tar.xz kernel-qcow2-linux-42bd6a56ed1ab4b2cb50f4d4e674874da9b47f46.zip | |
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
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index fe7a54b65e55..ea155183c1d6 100644 --- 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); } |