diff options
| author | Julian Veit <claymore1298@gmail.com> | 2023-09-26 08:52:07 +0200 |
|---|---|---|
| committer | Julian Veit <claymore1298@gmail.com> | 2023-09-26 08:52:07 +0200 |
| commit | 0c987c30561cb140b6765896466687b01469e56b (patch) | |
| tree | b6c599221e1de74895f2a3b00387a9a489ce14bc | |
| parent | cbee3767635ea1b08e2fce98c1c58e3ec5c7a331 (diff) | |
| parent | 26115431ba81de998abaecdfafd802eb98a96f8b (diff) | |
Merge tag 'android-13.0.0_r75' of https://android.googlesource.com/platform/packages/modules/Bluetooth into HEAD
Android 13.0.0 release 75
Change-Id: Iadb626579aee524fd72e294bee4fb03e1c7f3b3f
| -rw-r--r-- | system/stack/eatt/eatt.h | 9 | ||||
| -rw-r--r-- | system/stack/eatt/eatt_impl.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/system/stack/eatt/eatt.h b/system/stack/eatt/eatt.h index 6ef3d3359a..1310f65480 100644 --- a/system/stack/eatt/eatt.h +++ b/system/stack/eatt/eatt.h @@ -17,6 +17,7 @@ #pragma once +#include <algorithm> #include <deque> #include "stack/gatt/gatt_int.h" @@ -24,6 +25,7 @@ #define EATT_MIN_MTU_MPS (64) #define EATT_DEFAULT_MTU (256) +#define EATT_MAX_TX_MTU (1024) #define EATT_ALL_CIDS (0xFFFF) namespace bluetooth { @@ -59,13 +61,13 @@ class EattChannel { EattChannel(RawAddress& bda, uint16_t cid, uint16_t tx_mtu, uint16_t rx_mtu) : bda_(bda), cid_(cid), - tx_mtu_(tx_mtu), rx_mtu_(rx_mtu), state_(EattChannelState::EATT_CHANNEL_PENDING), indicate_handle_(0), ind_ack_timer_(NULL), ind_confirmation_timer_(NULL) { cl_cmd_q_ = std::deque<tGATT_CMD_Q>(); + EattChannelSetTxMTU(tx_mtu); } ~EattChannel() { @@ -94,7 +96,10 @@ class EattChannel { } state_ = state; } - void EattChannelSetTxMTU(uint16_t tx_mtu) { this->tx_mtu_ = tx_mtu; } + + void EattChannelSetTxMTU(uint16_t tx_mtu) { + this->tx_mtu_ = std::min<uint16_t>(tx_mtu, EATT_MAX_TX_MTU); + } }; /* Interface class */ diff --git a/system/stack/eatt/eatt_impl.h b/system/stack/eatt/eatt_impl.h index 998fc10905..c5a78550ce 100644 --- a/system/stack/eatt/eatt_impl.h +++ b/system/stack/eatt/eatt_impl.h @@ -447,7 +447,7 @@ struct eatt_impl { if (is_local_cfg) channel->rx_mtu_ = p_cfg->mtu; else - channel->tx_mtu_ = p_cfg->mtu; + channel->EattChannelSetTxMTU(p_cfg->mtu); /* Go back to open state */ channel->EattChannelSetState(EattChannelState::EATT_CHANNEL_OPENED); |