Skip to content

Commit e4e3eb7

Browse files
committed
Revert "[nrf fromtree] [mrp] Make sure not all packet buffers are used for retransmissions (project-chip#33334)"
This reverts commit e7d3cb7. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent fab222c commit e4e3eb7

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

src/messaging/ReliableMessageProtocolConfig.h

+2-9
Original file line numberDiff line numberDiff line change
@@ -130,22 +130,15 @@ namespace chip {
130130
#if CHIP_SYSTEM_CONFIG_USE_LWIP
131131

132132
#if !LWIP_PBUF_FROM_CUSTOM_POOLS && PBUF_POOL_SIZE != 0
133-
// Configure the table size to be less than the number of packet buffers to make sure
134-
// that not all buffers are held by the retransmission entries, in which case the device
135-
// is unable to receive an ACK and hence becomes unavailable until a message times out.
136-
#define CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE std::min(PBUF_POOL_SIZE - 1, CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS)
133+
#define CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE std::min(PBUF_POOL_SIZE, CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS)
137134
#else
138135
#define CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
139136
#endif // !LWIP_PBUF_FROM_CUSTOM_POOLS && PBUF_POOL_SIZE != 0
140137

141138
#else // CHIP_SYSTEM_CONFIG_USE_LWIP
142139

143140
#if CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE != 0
144-
// Configure the table size to be less than the number of packet buffers to make sure
145-
// that not all buffers are held by the retransmission entries, in which case the device
146-
// is unable to receive an ACK and hence becomes unavailable until a message times out.
147-
#define CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE \
148-
std::min(CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE - 1, CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS)
141+
#define CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE std::min(CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE, CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS)
149142
#else
150143
#define CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS
151144
#endif // CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE != 0

0 commit comments

Comments
 (0)