michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: l2cap: Reduce size of disconnect pool

Browse source 
Reduce the size of the disconnect pool required the full MTU
for a disconnect request.
Also completely remove the pool when not needed.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-10-12 10:12:42 +02:00 • committed by Carles Cufí
commit 3346aa4d39
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
subsys/bluetooth/host/l2cap.c
View file

@ -54,13 +54,15 @@
#define L2CAP_DISC_TIMEOUT K_SECONDS(2) #define L2CAP_DISC_TIMEOUT K_SECONDS(2)
#define L2CAP_RTX_TIMEOUT K_SECONDS(2) #define L2CAP_RTX_TIMEOUT K_SECONDS(2)
#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
/* Dedicated pool for disconnect buffers so they are guaranteed to be send /* Dedicated pool for disconnect buffers so they are guaranteed to be send
* even in case of data congestion due to flooding. * even in case of data congestion due to flooding.
*/ */
NET_BUF_POOL_FIXED_DEFINE(disc_pool, 1, NET_BUF_POOL_FIXED_DEFINE(disc_pool, 1,
BT_L2CAP_BUF_SIZE(CONFIG_BT_L2CAP_TX_MTU), NULL); BT_L2CAP_BUF_SIZE(
sizeof(struct bt_l2cap_disconn_req)),
NULL);
#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
#define L2CAP_MAX_LE_MPS CONFIG_BT_L2CAP_RX_MTU #define L2CAP_MAX_LE_MPS CONFIG_BT_L2CAP_RX_MTU
/* For now use MPS - SDU length to disable segmentation */ /* For now use MPS - SDU length to disable segmentation */
#define L2CAP_MAX_LE_MTU (L2CAP_MAX_LE_MPS - 2) #define L2CAP_MAX_LE_MTU (L2CAP_MAX_LE_MPS - 2)
@ -401,10 +403,11 @@ static struct net_buf *l2cap_create_le_sig_pdu(struct net_buf *buf,
struct bt_l2cap_sig_hdr *hdr; struct bt_l2cap_sig_hdr *hdr;
struct net_buf_pool *pool = NULL; struct net_buf_pool *pool = NULL;
#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
if (code == BT_L2CAP_DISCONN_REQ) { if (code == BT_L2CAP_DISCONN_REQ) {
pool = &disc_pool; pool = &disc_pool;
} }
#endif
/* Don't wait more than the minimum RTX timeout of 2 seconds */ /* Don't wait more than the minimum RTX timeout of 2 seconds */
buf = bt_l2cap_create_pdu_timeout(pool, 0, L2CAP_RTX_TIMEOUT); buf = bt_l2cap_create_pdu_timeout(pool, 0, L2CAP_RTX_TIMEOUT);
if (!buf) { if (!buf) {