Merge "Use appropriate Tx time in BLE Set Data length command"
diff --git a/stack/btm/btm_ble.cc b/stack/btm/btm_ble.cc
index 903cdea..7a9a1e4 100644
--- a/stack/btm/btm_ble.cc
+++ b/stack/btm/btm_ble.cc
@@ -753,6 +753,7 @@
tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr,
uint16_t tx_pdu_length) {
tACL_CONN* p_acl = btm_bda_to_acl(bd_addr, BT_TRANSPORT_LE);
+ uint16_t tx_time = BTM_BLE_DATA_TX_TIME_MAX_LEGACY;
if (p_acl == NULL) {
BTM_TRACE_ERROR("%s: Wrong mode: no LE link exist or LE not supported",
@@ -777,9 +778,10 @@
else if (tx_pdu_length < BTM_BLE_DATA_SIZE_MIN)
tx_pdu_length = BTM_BLE_DATA_SIZE_MIN;
- /* always set the TxTime to be max, as controller does not care for now */
- btsnd_hcic_ble_set_data_length(p_acl->hci_handle, tx_pdu_length,
- BTM_BLE_DATA_TX_TIME_MAX);
+ if (controller_get_interface()->get_bt_version()->hci_version >= HCI_PROTO_VERSION_5_0)
+ tx_time = BTM_BLE_DATA_TX_TIME_MAX;
+
+ btsnd_hcic_ble_set_data_length(p_acl->hci_handle, tx_pdu_length, tx_time);
return BTM_SUCCESS;
}
diff --git a/stack/include/btm_ble_api_types.h b/stack/include/btm_ble_api_types.h
index a415184..d7b223f 100644
--- a/stack/include/btm_ble_api_types.h
+++ b/stack/include/btm_ble_api_types.h
@@ -335,7 +335,8 @@
/* Preferred maximum number of microseconds that the local Controller
should use to transmit a single Link Layer Data Channel PDU. */
#define BTM_BLE_DATA_TX_TIME_MIN 0x0148
-#define BTM_BLE_DATA_TX_TIME_MAX 0x0848
+#define BTM_BLE_DATA_TX_TIME_MAX_LEGACY 0x0848
+#define BTM_BLE_DATA_TX_TIME_MAX 0x4290
/* adv tx power in dBm */
typedef struct {