]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Bluetooth: mgmt: multi adv for get_current_adv_instance()
authorFlorian Grandel <fgrandel@gmail.com>
Thu, 18 Jun 2015 01:16:39 +0000 (03:16 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 18 Jun 2015 16:11:51 +0000 (18:11 +0200)
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>
net/bluetooth/mgmt.c

index 49356c7788f96a534a430abdce7bbd5b8d2deb72..55b91530ea2688b9ccdfcf9795ed3b2b52118bf2 100644 (file)
@@ -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;
 }