From: Michał Narajowski Date: Thu, 22 Sep 2016 14:01:39 +0000 (+0200) Subject: Bluetooth: Fix not updating scan rsp when adv off X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7dc6f16c68757548a332a0c5fbe661987c2189a9;p=linux-beck.git Bluetooth: Fix not updating scan rsp when adv off Scan response data should not be updated unless there is an advertising instance. Signed-off-by: Michał Narajowski Signed-off-by: Marcel Holtmann --- diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 63f42f45a96a..19b8a5e9420d 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -3159,7 +3159,7 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data, /* The name is stored in the scan response data and so * no need to udpate the advertising data here. */ - if (lmp_le_capable(hdev)) + if (lmp_le_capable(hdev) && hci_dev_test_flag(hdev, HCI_ADVERTISING)) __hci_req_update_scan_rsp_data(&req, hdev->cur_adv_instance); err = hci_req_run(&req, set_name_complete);