summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbernard <[email protected]>2014-06-25 17:26:08 +0800
committerbernard <[email protected]>2014-06-25 17:26:08 +0800
commitedfcc6041baed6ec1b6fc7c0ab63b0a717cdb1b2 (patch)
tree983af5d5b10ce9b28fced0d376c584d6f1dcc0c7
parentdcd79747947803dbc724bcd49bcfca42a5932c06 (diff)
parentd10444337bed805965737e70820588ea179ba75e (diff)
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
-rw-r--r--components/net/lwip-1.4.1/src/lwipopts.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/components/net/lwip-1.4.1/src/lwipopts.h b/components/net/lwip-1.4.1/src/lwipopts.h
index 10cb7893a7..dd5a3ace96 100644
--- a/components/net/lwip-1.4.1/src/lwipopts.h
+++ b/components/net/lwip-1.4.1/src/lwipopts.h
@@ -117,6 +117,8 @@
/* the number of simultaneously queued TCP */
#ifdef RT_LWIP_TCP_SEG_NUM
+#define MEMP_NUM_TCP_SEG RT_LWIP_TCP_SEG_NUM
+#else
#define MEMP_NUM_TCP_SEG TCP_SND_QUEUELEN
#endif
@@ -135,12 +137,12 @@
/* ---------- Pbuf options ---------- */
/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
#ifdef RT_LWIP_PBUF_NUM
-#define PBUF_POOL_SIZE RT_LWIP_PBUF_NUM
+#define PBUF_POOL_SIZE RT_LWIP_PBUF_NUM
#endif
/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
#ifdef RT_LWIP_PBUF_POOL_BUFSIZE
-#define PBUF_POOL_BUFSIZE RT_LWIP_PBUF_POOL_BUFSIZE
+#define PBUF_POOL_BUFSIZE RT_LWIP_PBUF_POOL_BUFSIZE
#endif
/* PBUF_LINK_HLEN: the number of bytes that should be allocated for a
@@ -176,7 +178,7 @@
/* TCP sender buffer space (bytes). */
#ifdef RT_LWIP_TCP_SND_BUF
-#define TCP_SND_BUF RT_LWIP_TCP_SND_BUF
+#define TCP_SND_BUF RT_LWIP_TCP_SND_BUF
#else
#define TCP_SND_BUF (TCP_MSS * 2)
#endif
@@ -307,7 +309,7 @@
* in this file.
*/
#ifdef RT_LWIP_PPPOE
-#define PPPOE_SUPPORT 1
+#define PPPOE_SUPPORT 1
#else
#define PPPOE_SUPPORT 0
#endif
@@ -315,7 +317,7 @@
#ifdef RT_LWIP_PPPOS
#define PPPOS_SUPPORT 1
#else
-#define PPPOS_SUPPORT 0
+#define PPPOS_SUPPORT 0
#endif
#define PAP_SUPPORT 1 /* Set > 0 for PAP. */