espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-21 09:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(lwip): Fix contains more than one tcp pbuf single tx packet

Browse Source 
Fix TX exist more pbufs after enable LWIP_NETIF_TX_SINGLE_PBUF.

internal: 3d5f33f0
This commit is contained in:
Espressif Systems
2018-02-13 19:35:16 +08:00
parent 9416bcb821
commit 340b0a234e
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -13,7 +13,7 @@ gwen:
gitlab: gitlab:
espconn: 3a998034 espconn: 3a998034
freertos: ac047746 freertos: ac047746
lwip: 3e8cc2ef lwip: 3c4f800b
driver: 7bee5263 driver: 7bee5263
mbedtls: 1ac9f1f4 mbedtls: 1ac9f1f4
ssl: eefb383a ssl: eefb383a

BIN
lib/liblwip.a
View File

Binary file not shown.

2
third_party/lwip/core/tcp_out.c vendored
View File

@ -464,6 +464,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
LWIP_ASSERT("inconsistend oversize vs. len", (oversize == 0) || (pos == len)); LWIP_ASSERT("inconsistend oversize vs. len", (oversize == 0) || (pos == len));
#endif /* TCP_OVERSIZE */ #endif /* TCP_OVERSIZE */
#if !LWIP_NETIF_TX_SINGLE_PBUF
/* /*
* Phase 2: Chain a new pbuf to the end of pcb->unsent. * Phase 2: Chain a new pbuf to the end of pcb->unsent.
* *
@ -513,6 +514,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
pos += seglen; pos += seglen;
queuelen += pbuf_clen(concat_p); queuelen += pbuf_clen(concat_p);
} }
#endif /* !LWIP_NETIF_TX_SINGLE_PBUF */
} else { } else {
#if TCP_OVERSIZE #if TCP_OVERSIZE
LWIP_ASSERT("unsent_oversize mismatch (pcb->unsent is NULL)", LWIP_ASSERT("unsent_oversize mismatch (pcb->unsent is NULL)",