summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-11-27 10:52:39 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-12-10 00:51:49 +0100
commitd6dac32e84e407ba15f257b5df2f4cb263005ab4 (patch)
tree13f26ab0441f8d90614e81ef9a4623e9e98c9918
parent742c59516822f4a4bc23b0961d88c569a7f1bf71 (diff)
downloadlinux-d6dac32e84e407ba15f257b5df2f4cb263005ab4.tar.bz2
Bluetooth: Fix updating wrong instance's scan_rsp data
The __hci_req_update_scan_rsp_data gets the instance to be updated which should get passed to update_inst_scan_rsp_data() instead of always enabling the current instance. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/hci_request.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index adfcd6f1d0de..edf2199de4ff 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1018,7 +1018,7 @@ void __hci_req_update_scan_rsp_data(struct hci_request *req, int instance)
if (instance == HCI_ADV_CURRENT)
instance = get_current_adv_instance(req->hdev);
- update_inst_scan_rsp_data(req, get_current_adv_instance(req->hdev));
+ update_inst_scan_rsp_data(req, instance);
}
static u8 create_instance_adv_data(struct hci_dev *hdev, u8 instance, u8 *ptr)