Bluetooth: Clean up current advertising instance tracking

We can simplify a lot of code by making sure hdev->cur_adv_instance is
always up-to-date. This allows e.g. the removal of the
get_current_adv_instance() helper function and the special
HCI_ADV_CURRENT value. This patch also makes selecting instance 0x00
explicit in the various calls where advertising instances aren't
enabled, e.g. when HCI_ADVERTISING is set or we've just finished
enabling LE.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 03a65e89a7d7..621f6fdd0dd1 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1626,8 +1626,8 @@ static void le_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)
                 struct hci_request req;
 
                 hci_req_init(&req, hdev);
-                __hci_req_update_adv_data(&req, HCI_ADV_CURRENT);
-                __hci_req_update_scan_rsp_data(&req, HCI_ADV_CURRENT);
+                __hci_req_update_adv_data(&req, 0x00);
+                __hci_req_update_scan_rsp_data(&req, 0x00);
                 hci_req_run(&req, NULL);
                 hci_update_background_scan(hdev);
         }
@@ -3006,7 +3006,7 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
          * no need to udpate the advertising data here.
          */
         if (lmp_le_capable(hdev))
-                __hci_req_update_scan_rsp_data(&req, HCI_ADV_CURRENT);
+                __hci_req_update_scan_rsp_data(&req, hdev->cur_adv_instance);
 
         err = hci_req_run(&req, set_name_complete);
         if (err < 0)
@@ -3799,6 +3799,7 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,
                 bool changed;
 
                 if (cp->val) {
+                        hdev->cur_adv_instance = 0x00;
                         changed = !hci_dev_test_and_set_flag(hdev, HCI_ADVERTISING);
                         if (cp->val == 0x02)
                                 hci_dev_set_flag(hdev, HCI_ADVERTISING_CONNECTABLE);
@@ -3846,6 +3847,7 @@ static int set_advertising(struct sock *sk, struct hci_dev *hdev, void *data,
                  * We cannot use update_[adv|scan_rsp]_data() here as the
                  * HCI_ADVERTISING flag is not yet set.
                  */
+                hdev->cur_adv_instance = 0x00;
                 __hci_req_update_adv_data(&req, 0x00);
                 __hci_req_update_scan_rsp_data(&req, 0x00);
                 __hci_req_enable_advertising(&req);
@@ -4195,7 +4197,7 @@ static int set_bredr(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
         /* Since only the advertising data flags will change, there
          * is no need to update the scan response data.
          */
-        __hci_req_update_adv_data(&req, HCI_ADV_CURRENT);
+        __hci_req_update_adv_data(&req, hdev->cur_adv_instance);
 
         err = hci_req_run(&req, set_bredr_complete);
         if (err < 0)