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

nimble/ll: Fix for frag tx of mbufs >255 bytes

Browse Source
This commit is contained in:
Niklas Casaril
2021-03-29 12:39:59 +02:00
committed by Andrzej Kaczmarek
parent 8cd76e5dfd
commit f0a5e96db2
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_conn.c
+9 -10
View File
@@ -959,8 +959,8 @@ ble_ll_conn_tx_pdu(struct ble_ll_conn_sm *connsm)
uint8_t hdr_byte; uint8_t hdr_byte;
uint8_t end_transition; uint8_t end_transition;
uint8_t cur_txlen; uint8_t cur_txlen;
uint8_t next_txlen; uint16_t next_txlen;
uint8_t cur_offset; uint16_t cur_offset;
uint16_t pktlen; uint16_t pktlen;
uint32_t next_event_time; uint32_t next_event_time;
uint32_t ticks; uint32_t ticks;
@@ -1129,11 +1129,10 @@ ble_ll_conn_tx_pdu(struct ble_ll_conn_sm *connsm)
if ((cur_offset + cur_txlen) < pktlen) { if ((cur_offset + cur_txlen) < pktlen) {
next_txlen = pktlen - (cur_offset + cur_txlen); next_txlen = pktlen - (cur_offset + cur_txlen);
} else { } else {
if (nextpkthdr->omp_len > connsm->eff_max_tx_octets) { next_txlen = connsm->eff_max_tx_octets;
next_txlen = connsm->eff_max_tx_octets; }
} else { if (next_txlen > connsm->eff_max_tx_octets) {
next_txlen = nextpkthdr->omp_len; next_txlen = connsm->eff_max_tx_octets;
}
} }
/* /*
@@ -1491,7 +1490,7 @@ ble_ll_conn_can_send_next_pdu(struct ble_ll_conn_sm *connsm, uint32_t begtime,
uint32_t add_usecs) uint32_t add_usecs)
{ {
int rc; int rc;
uint8_t rem_bytes; uint16_t rem_bytes;
uint32_t ticks; uint32_t ticks;
uint32_t usecs; uint32_t usecs;
uint32_t next_sched_time; uint32_t next_sched_time;
@@ -3791,7 +3790,7 @@ ble_ll_conn_rx_isr_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr)
uint8_t conn_sn; uint8_t conn_sn;
uint8_t conn_nesn; uint8_t conn_nesn;
uint8_t reply; uint8_t reply;
uint8_t rem_bytes; uint16_t rem_bytes;
uint8_t opcode = 0; uint8_t opcode = 0;
uint8_t rx_pyld_len; uint8_t rx_pyld_len;
uint32_t begtime; uint32_t begtime;
@@ -4074,7 +4073,7 @@ conn_exit:
*/ */
void void
ble_ll_conn_enqueue_pkt(struct ble_ll_conn_sm *connsm, struct os_mbuf *om, ble_ll_conn_enqueue_pkt(struct ble_ll_conn_sm *connsm, struct os_mbuf *om,
uint8_t hdr_byte, uint8_t length) uint8_t hdr_byte, uint16_t length)
{ {
os_sr_t sr; os_sr_t sr;
struct os_mbuf_pkthdr *pkthdr; struct os_mbuf_pkthdr *pkthdr;
nimble/controller/src/ble_ll_conn_priv.h
+1 -1
View File
@@ -120,7 +120,7 @@ struct hci_create_conn
void ble_ll_conn_sm_new(struct ble_ll_conn_sm *connsm); void ble_ll_conn_sm_new(struct ble_ll_conn_sm *connsm);
void ble_ll_conn_end(struct ble_ll_conn_sm *connsm, uint8_t ble_err); void ble_ll_conn_end(struct ble_ll_conn_sm *connsm, uint8_t ble_err);
void ble_ll_conn_enqueue_pkt(struct ble_ll_conn_sm *connsm, struct os_mbuf *om, void ble_ll_conn_enqueue_pkt(struct ble_ll_conn_sm *connsm, struct os_mbuf *om,
uint8_t hdr_byte, uint8_t length); uint8_t hdr_byte, uint16_t length);
struct ble_ll_conn_sm *ble_ll_conn_sm_get(void); struct ble_ll_conn_sm *ble_ll_conn_sm_get(void);
void ble_ll_conn_master_init(struct ble_ll_conn_sm *connsm, void ble_ll_conn_master_init(struct ble_ll_conn_sm *connsm,
struct hci_create_conn *hcc); struct hci_create_conn *hcc);
nimble/include/nimble/ble.h
+2 -2
View File
@@ -109,9 +109,9 @@ struct ble_mbuf_hdr_rxinfo
struct ble_mbuf_hdr_txinfo struct ble_mbuf_hdr_txinfo
{ {
uint8_t flags; uint8_t flags;
uint8_t offset;
uint8_t pyld_len;
uint8_t hdr_byte; uint8_t hdr_byte;
uint16_t offset;
uint16_t pyld_len;
}; };
struct ble_mbuf_hdr struct ble_mbuf_hdr