OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d3900cb
)
Bluetooth: Fix updating the right variable in update_scan_rsp_data()
author
Johan Hedberg
<johan.hedberg@intel.com>
Wed, 16 Oct 2013 12:31:07 +0000
(15:31 +0300)
committer
Marcel Holtmann
<marcel@holtmann.org>
Wed, 16 Oct 2013 14:02:14 +0000
(07:02 -0700)
This function should be operating on scan_rsp_data_len and scan_rsp_data
and not the advertising data variables.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/mgmt.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/mgmt.c
b/net/bluetooth/mgmt.c
index
0bf823b
..
a727b47
100644
(file)
--- a/
net/bluetooth/mgmt.c
+++ b/
net/bluetooth/mgmt.c
@@
-575,12
+575,12
@@
static void update_scan_rsp_data(struct hci_request *req)
len = create_scan_rsp_data(hdev, cp.data);
- if (hdev->
adv
_data_len == len &&
- memcmp(cp.data, hdev->
adv
_data, len) == 0)
+ if (hdev->
scan_rsp
_data_len == len &&
+ memcmp(cp.data, hdev->
scan_rsp
_data, len) == 0)
return;
- memcpy(hdev->
adv
_data, cp.data, sizeof(cp.data));
- hdev->
adv
_data_len = len;
+ memcpy(hdev->
scan_rsp
_data, cp.data, sizeof(cp.data));
+ hdev->
scan_rsp
_data_len = len;
cp.length = len;