Bluetooth: hci_sync: Fix hci_resume_advertising_sync

[ Upstream commit 1488af7b8b5f9896ea88ee35aa3301713f72737c ]

hci_resume_advertising_sync is suppose to resume all instance paused by
hci_pause_advertising_sync, this logic is used for procedures are only
allowed when not advertising, but instance 0x00 was not being
re-enabled.

Fixes: ad383c2c65a5 ("Bluetooth: hci_sync: Enable advertising when LL privacy is enabled")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index a25439f1eeac28657622fe7f5f399dd9e39b4318..7ca544d7791f43e3b63a095a95cb60f55718ed2c 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -2594,6 +2594,13 @@ static int hci_resume_advertising_sync(struct hci_dev *hdev)
                        hci_remove_ext_adv_instance_sync(hdev, adv->instance,
                                                         NULL);
                }
+
+               /* If current advertising instance is set to instance 0x00
+                * then we need to re-enable it.
+                */
+               if (!hdev->cur_adv_instance)
+                       err = hci_enable_ext_advertising_sync(hdev,
+                                                             hdev->cur_adv_instance);
        } else {
                /* Schedule for most recent instance to be restarted and begin
                 * the software rotation loop