summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArman Uguray <armansito@chromium.org>2015-03-28 20:39:00 +0100
committerMarcel Holtmann <marcel@holtmann.org>2015-03-28 21:31:57 +0100
commit880897d4c9eedd69b33b9905a6919e3e4f58eae8 (patch)
tree1da327df642e26ed8ed823a83bf7ca13f69f15d0 /net
parentBluetooth: Use ADV_SCAN_IND for adv. instances (diff)
downloadlinux-880897d4c9eedd69b33b9905a6919e3e4f58eae8.tar.xz
linux-880897d4c9eedd69b33b9905a6919e3e4f58eae8.zip
Bluetooth: Update adv. parameters when conn. setting changes
This patch fixes a bug where the advertising parameters weren't updated after a call to "Set Connectable" if the HCI_ADVERTISING_INSTANCE setting was set. Signed-off-by: Arman Uguray <armansito@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/mgmt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 2d84fc16e108..29cbd98f4649 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2113,7 +2113,8 @@ static int set_connectable(struct sock *sk, struct hci_dev *hdev, void *data,
no_scan_update:
/* Update the advertising parameters if necessary */
- if (hci_dev_test_flag(hdev, HCI_ADVERTISING))
+ if (hci_dev_test_flag(hdev, HCI_ADVERTISING) ||
+ hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE))
enable_advertising(&req);
err = hci_req_run(&req, set_connectable_complete);