j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lwip: merge upstream master.

Browse source
This commit is contained in:
Our Air Quality 2017-09-21 20:49:23 +10:00
parent 5e92d55af5
commit 1e76ce25d5
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lwip/esp_interface.c
View file

@ -166,9 +166,10 @@ void pp_recycle_rx_pbuf(struct pbuf *p)
/* Return the number of ooseq bytes that can be retained given the current /* Return the number of ooseq bytes that can be retained given the current
* size 'n'. */ * size 'n'. */
size_t ooseq_bytes_limit(struct tcp_seg *ooseq) size_t ooseq_bytes_limit(struct tcp_pcb *pcb)
{ {
#if COPY_PP_RX_PBUFS #if COPY_PP_RX_PBUFS
struct tcp_seg *ooseq = pcb->ooseq;
size_t ooseq_blen = 0; size_t ooseq_blen = 0;
for (; ooseq != NULL; ooseq = ooseq->next) { for (; ooseq != NULL; ooseq = ooseq->next) {
struct pbuf *p = ooseq->p; struct pbuf *p = ooseq->p;
@ -192,8 +193,9 @@ size_t ooseq_bytes_limit(struct tcp_seg *ooseq)
/* Return the number of ooseq pbufs that can be retained given the current /* Return the number of ooseq pbufs that can be retained given the current
* size 'n'. */ * size 'n'. */
size_t ooseq_pbufs_limit(struct tcp_seg *ooseq) size_t ooseq_pbufs_limit(struct tcp_pcb *pcb)
{ {
struct tcp_seg *ooseq = pcb->ooseq;
size_t ooseq_qlen = 0; size_t ooseq_qlen = 0;
for (; ooseq != NULL; ooseq = ooseq->next) { for (; ooseq != NULL; ooseq = ooseq->next) {
struct pbuf *p = ooseq->p; struct pbuf *p = ooseq->p;

6
lwip/include/arch/cc.h
View file

@ -48,9 +48,9 @@ void sdk_system_pp_recycle_rx_pkt(struct esf_buf *);
struct pbuf; struct pbuf;
void pp_recycle_rx_pbuf(struct pbuf *); void pp_recycle_rx_pbuf(struct pbuf *);
struct tcp_seg; struct tcp_pcb;
size_t ooseq_bytes_limit(struct tcp_seg *ooseq); size_t ooseq_bytes_limit(struct tcp_pcb *);
size_t ooseq_pbufs_limit(struct tcp_seg *ooseq); size_t ooseq_pbufs_limit(struct tcp_pcb *);
/* Define generic types used in lwIP */ /* Define generic types used in lwIP */
typedef uint8_t u8_t; typedef uint8_t u8_t;

2
lwip/lwip

@ -1 +1 @@
Subproject commit b9416cd99fbc696f7be1894f1c4a635e2cc7503f Subproject commit 16c0f928b5d6f557e845d96782cb3fa4e8e549fd