From: Johan Hedberg Date: Fri, 27 Nov 2015 08:52:39 +0000 (+0200) Subject: Bluetooth: Fix updating wrong instance's scan_rsp data X-Git-Tag: v4.5-rc1~128^2~143^2~26 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d6dac32e84e407ba15f257b5df2f4cb263005ab4;p=karo-tx-linux.git 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 Signed-off-by: Marcel Holtmann --- 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)