summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorFlorian Grandel <fgrandel@gmail.com>2015-06-18 04:16:39 +0300
committerMarcel Holtmann <marcel@holtmann.org>2015-06-18 19:11:51 +0300
commit3ff37e6b8cfcc57412320ec30f2b66d47f271cad (patch)
treee752c5771bcbb1b4832e1b108c529d7a05012d6f /net/bluetooth
parent286e0c83df948eef9f51d50ed68ec8a1bb5051e4 (diff)
downloadlinux-3ff37e6b8cfcc57412320ec30f2b66d47f271cad.tar.xz
Bluetooth: mgmt: multi adv for get_current_adv_instance()
Replaces the hard coded instance identifier in get_current_adv_instance() with the actual current instance identifier so that this method is prepared to work with more than one advertising instance. Signed-off-by: Florian Grandel <fgrandel@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 49356c7788f9..55b91530ea26 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -841,7 +841,7 @@ static u8 get_current_adv_instance(struct hci_dev *hdev)
*/
if (hci_dev_test_flag(hdev, HCI_ADVERTISING_INSTANCE) &&
!hci_dev_test_flag(hdev, HCI_ADVERTISING))
- return 0x01;
+ return hdev->cur_adv_instance;
return 0x00;
}