espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-19 19:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/host: Fix credits setting for L2CAP CoC

Browse Source 
With current implementation we could end up having credits 0 when
requested L2CAP CoC MTU is much lower than MTU on L2CAP channel.

This patch fixes it.
This commit is contained in:
Łukasz Rymanowski
2019-03-13 09:28:15 +01:00
parent e1d3968bf0
commit f8f02740ac
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_l2cap_coc.c
+4 -1
View File
@@ -255,7 +255,10 @@ ble_l2cap_coc_chan_alloc(uint16_t conn_handle, uint16_t psm, uint16_t mtu,
/* Number of credits should allow to send full SDU with on given /* Number of credits should allow to send full SDU with on given
* L2CAP MTU * L2CAP MTU
*/ */
chan->coc_rx.credits = (mtu + (chan->my_mtu - 1) / 2) / chan->my_mtu; chan->coc_rx.credits = mtu / chan->my_mtu;
if (mtu % chan->my_mtu) {
chan->coc_rx.credits++;
}
chan->initial_credits = chan->coc_rx.credits; chan->initial_credits = chan->coc_rx.credits;
return chan; return chan;
nimble/host/test/src/ble_l2cap_test.c
+18 -4
View File
@@ -719,6 +719,18 @@ ble_l2cap_test_event(struct ble_l2cap_event *event, void *arg)
} }
} }
static uint16_t ble_l2cap_calculate_credits(uint16_t mtu, uint16_t mps)
{
int credits;
credits = mtu / mps;
if (mtu % mps) {
credits++;
}
return credits;
}
static void static void
ble_l2cap_test_coc_connect(struct test_data *t) ble_l2cap_test_coc_connect(struct test_data *t)
{ {
@@ -747,8 +759,9 @@ ble_l2cap_test_coc_connect(struct test_data *t)
return; return;
} }
req.credits = htole16((t->mtu + (MYNEWT_VAL(BLE_L2CAP_COC_MTU) - 1) / 2) / req.credits = htole16(
MYNEWT_VAL(BLE_L2CAP_COC_MTU)); ble_l2cap_calculate_credits(t->mtu,
MYNEWT_VAL(BLE_L2CAP_COC_MTU)));
req.mps = htole16(MYNEWT_VAL(BLE_L2CAP_COC_MTU)); req.mps = htole16(MYNEWT_VAL(BLE_L2CAP_COC_MTU));
req.mtu = htole16(t->mtu); req.mtu = htole16(t->mtu);
req.psm = htole16(t->psm); req.psm = htole16(t->psm);
@@ -812,8 +825,9 @@ ble_l2cap_test_coc_connect_by_peer(struct test_data *t)
rsp.result = htole16(ev->l2cap_status); rsp.result = htole16(ev->l2cap_status);
} else { } else {
/* Receive response from peer.*/ /* Receive response from peer.*/
rsp.credits = htole16((t->mtu + (MYNEWT_VAL(BLE_L2CAP_COC_MTU) - 1) / 2) / rsp.credits = htole16(
MYNEWT_VAL(BLE_L2CAP_COC_MTU)); ble_l2cap_calculate_credits(t->mtu,
MYNEWT_VAL(BLE_L2CAP_COC_MTU)));
rsp.dcid = current_cid++; rsp.dcid = current_cid++;
rsp.mps = htole16(MYNEWT_VAL(BLE_L2CAP_COC_MTU)); rsp.mps = htole16(MYNEWT_VAL(BLE_L2CAP_COC_MTU));
rsp.mtu = htole16(t->mtu); rsp.mtu = htole16(t->mtu);