Bluetooth: MGMT: mesh_send: check instances prior disabling advertising

commit f3cb5676e5c11c896ba647ee309a993e73531588 upstream.

The unconditional call of hci_disable_advertising_sync() in
mesh_send_done_sync() also disables other LE advertisings (non mesh
related).

I am not sure whether this call is required at all, but checking the
adv_instances list (like done at other places) seems to solve the
problem.

Fixes: b338d91703fa ("Bluetooth: Implement support for Mesh")
Cc: stable@vger.kernel.org
Signed-off-by: Christian Eggers <ceggers@arri.de>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 8bef24228b5c8def88f60ebb5a9ba1378a4d26f0..82fa8c28438f25330e474b84c94bbe705709abed 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1074,7 +1074,8 @@ static int mesh_send_done_sync(struct hci_dev *hdev, void *data)
        struct mgmt_mesh_tx *mesh_tx;
 
        hci_dev_clear_flag(hdev, HCI_MESH_SENDING);
-       hci_disable_advertising_sync(hdev);
+       if (list_empty(&hdev->adv_instances))
+               hci_disable_advertising_sync(hdev);
        mesh_tx = mgmt_mesh_next(hdev, NULL);
 
        if (mesh_tx)