Bluetooth: ISO: Align broadcast sync_timeout with connection timeout

[ Upstream commit 42ed95de82c01184a88945d3ca274be6a7ea607d ]

This aligns broadcast sync_timeout with existing connection timeouts
which are 20 seconds long.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Stable-dep-of: b37cab587aa3 ("Bluetooth: ISO: Don't reject BT_ISO_QOS if parameters are unset")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index aa90adc3b2a4d7b8dab5759bd5392c164e238d37..28e32c9a6cc99173c9ad9cea52a976af910d22a2 100644 (file)
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -164,6 +164,8 @@ struct bt_voice {
 #define BT_ISO_QOS_BIG_UNSET   0xff
 #define BT_ISO_QOS_BIS_UNSET   0xff
 
+#define BT_ISO_SYNC_TIMEOUT    0x07d0 /* 20 secs */
+
 struct bt_iso_io_qos {
        __u32 interval;
        __u16 latency;

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index 0eeec64801390af77e6dd21aa1aab396a928a377..698d0b67c7ed4bb953a36174b53ed0d4147d7999 100644 (file)
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -764,10 +764,10 @@ static struct bt_iso_qos default_qos = {
                .bcode                  = {0x00},
                .options                = 0x00,
                .skip                   = 0x0000,
-               .sync_timeout           = 0x4000,
+               .sync_timeout           = BT_ISO_SYNC_TIMEOUT,
                .sync_cte_type          = 0x00,
                .mse                    = 0x00,
-               .timeout                = 0x4000,
+               .timeout                = BT_ISO_SYNC_TIMEOUT,
        },
 };