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

wujiangang · wujiangang · commit 340b0a234e36 · 2018-02-13T19:35:16.000+08:00
Fix TX exist more pbufs after enable LWIP_NETIF_TX_SINGLE_PBUF.

internal: 3d5f33f0
diff --git a/VERSION b/VERSION
@@ -13,7 +13,7 @@ gwen:
 gitlab:
     espconn:    3a998034
     freertos:   ac047746
-    lwip:       3e8cc2ef
+    lwip:       3c4f800b
     driver:     7bee5263
     mbedtls:    1ac9f1f4
     ssl:        eefb383a
diff --git a/lib/liblwip.a b/lib/liblwip.a
diff --git a/third_party/lwip/core/tcp_out.c b/third_party/lwip/core/tcp_out.c
@@ -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));
 #endif /* TCP_OVERSIZE */
 
+#if !LWIP_NETIF_TX_SINGLE_PBUF
     /*
      * 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;
       queuelen += pbuf_clen(concat_p);
     }
+#endif /* !LWIP_NETIF_TX_SINGLE_PBUF */
   } else {
 #if TCP_OVERSIZE
     LWIP_ASSERT("unsent_oversize mismatch (pcb->unsent is NULL)",

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,7 @@ tcp_write(struct tcp_pcb pcb, const void arg, u16_t len, u8_t apiflags)`
`464`	`464`	`LWIP_ASSERT("inconsistend oversize vs. len", (oversize == 0) \|\| (pos == len));`
`465`	`465`	`#endif /* TCP_OVERSIZE */`
`466`	`466`
	`467`	`+#if !LWIP_NETIF_TX_SINGLE_PBUF`
`467`	`468`	`/*`
`468`	`469`	`* Phase 2: Chain a new pbuf to the end of pcb->unsent.`
`469`	`470`	`*`
`@@ -513,6 +514,7 @@ tcp_write(struct tcp_pcb pcb, const void arg, u16_t len, u8_t apiflags)`
`513`	`514`	`pos += seglen;`
`514`	`515`	`queuelen += pbuf_clen(concat_p);`
`515`	`516`	`}`
	`517`	`+#endif /* !LWIP_NETIF_TX_SINGLE_PBUF */`
`516`	`518`	`} else {`
`517`	`519`	`#if TCP_OVERSIZE`
`518`	`520`	`LWIP_ASSERT("unsent_oversize mismatch (pcb->unsent is NULL)",`