This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new d7e9bb9 nimble/ll: Fix data length update from host
d7e9bb9 is described below
commit d7e9bb9b8d30f0539dd999b059e56accedd5d4f8
Author: Andrzej Kaczmarek <[email protected]>
AuthorDate: Fri Feb 14 17:26:18 2020 +0100
nimble/ll: Fix data length update from host
When host updates suggested data length we should also update values for
coded and uncoded PHYs since these values will be used when connection
is initialized. Otherwise we will basically disregard host suggestion
when PHY support is enabled (which we can do, but we do not want to).
---
nimble/controller/src/ble_ll_hci.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/nimble/controller/src/ble_ll_hci.c
b/nimble/controller/src/ble_ll_hci.c
index e90c42f..3c123b6 100644
--- a/nimble/controller/src/ble_ll_hci.c
+++ b/nimble/controller/src/ble_ll_hci.c
@@ -453,6 +453,17 @@ ble_ll_hci_le_wr_sugg_data_len(const uint8_t *cmdbuf,
uint8_t len)
g_ble_ll_conn_params.conn_init_max_tx_time =
min(tx_time, g_ble_ll_conn_params.supp_max_tx_time);
+ /*
+ * Use the same for coded and uncoded defaults. These are used when PHY
+ * parameters are initialized and we want to use values overridden by
+ * host. Make sure we do not exceed max supported time on uncoded.
+ */
+ g_ble_ll_conn_params.conn_init_max_tx_time_uncoded =
+ min(BLE_LL_CONN_SUPP_TIME_MAX_UNCODED,
+
g_ble_ll_conn_params.conn_init_max_tx_time);
+ g_ble_ll_conn_params.conn_init_max_tx_time_coded =
+ g_ble_ll_conn_params.conn_init_max_tx_time;
+
rc = BLE_ERR_SUCCESS;
} else {
rc = BLE_ERR_INV_HCI_CMD_PARMS;
