From 19f61332a9a9c5c0d585d88d2bef7475594724a2 Mon Sep 17 00:00:00 2001
From: Liu Zhi Fu <liuzhifu@espressif.com>
Date: Mon, 31 Oct 2016 19:38:47 +0800
Subject: [PATCH] make build pass when disable per soc tcp window

---
 components/lwip/core/init.c                  | 22 ++++++++++----------
 components/lwip/include/lwip/port/lwipopts.h |  5 +++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/components/lwip/core/init.c b/components/lwip/core/init.c
index 774e9a2be..8b2e92669 100755
--- a/components/lwip/core/init.c
+++ b/components/lwip/core/init.c
@@ -135,7 +135,7 @@
 //#endif
 #else /* LWIP_WND_SCALE */
 
-#if (ESP_PER_SOC_TCP_WND == 0)
+#if ! ESP_PER_SOC_TCP_WND
 #if (LWIP_TCP && (TCP_WND > 0xffff))
   #error "If you want to use TCP, TCP_WND must fit in an u16_t, so, you have to reduce it in your lwipopts.h (or enable window scaling)"
 #endif
@@ -143,11 +143,11 @@
 
 #endif /* LWIP_WND_SCALE */
 
-#if (ESP_PER_SOC_TCP_WND == 0)
-#if (LWIP_TCP && (TCP_SND_QUEUELEN > 0xffff))
+#if ! ESP_PER_SOC_TCP_WND
+#if (LWIP_TCP && (TCP_SND_QUEUELEN(0) > 0xffff))
   #error "If you want to use TCP, TCP_SND_QUEUELEN must fit in an u16_t, so, you have to reduce it in your lwipopts.h"
 #endif
-#if (LWIP_TCP && (TCP_SND_QUEUELEN < 2))
+#if (LWIP_TCP && (TCP_SND_QUEUELEN(0) < 2))
   #error "TCP_SND_QUEUELEN must be at least 2 for no-copy TCP writes to work"
 #endif
 
@@ -286,25 +286,25 @@
 
 /* TCP sanity checks */
 #if !LWIP_DISABLE_TCP_SANITY_CHECKS
+#if ! ESP_PER_SOC_TCP_WND
 #if LWIP_TCP
-#if !MEMP_MEM_MALLOC && (MEMP_NUM_TCP_SEG < TCP_SND_QUEUELEN)
+#if !MEMP_MEM_MALLOC && (MEMP_NUM_TCP_SEG < TCP_SND_QUEUELEN(0))
   #error "lwip_sanity_check: WARNING: MEMP_NUM_TCP_SEG should be at least as big as TCP_SND_QUEUELEN. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
 #endif
 
-#if (ESP_PER_SOC_TCP_WND == 0)
-#if TCP_SND_BUF < (2 * TCP_MSS)
+#if TCP_SND_BUF(0) < (2 * TCP_MSS)
   #error "lwip_sanity_check: WARNING: TCP_SND_BUF must be at least as much as (2 * TCP_MSS) for things to work smoothly. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
 #endif
-#if TCP_SND_QUEUELEN < (2 * (TCP_SND_BUF / TCP_MSS))
-  #error "lwip_sanity_check: WARNING: TCP_SND_QUEUELEN must be at least as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
+#if TCP_SND_QUEUELEN(0) < (2 * (TCP_SND_BUF(0) / TCP_MSS))
+  #error "lwip_sanity_check: WARNING: TCP_SND_QUEUELEN must be at least as much as (2 * TCP_SND_BUF(0)/TCP_MSS) for things to work. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
 #endif
-#if TCP_SNDLOWAT >= TCP_SND_BUF
+#if TCP_SNDLOWAT >= TCP_SND_BUF(0)
   #error "lwip_sanity_check: WARNING: TCP_SNDLOWAT must be less than TCP_SND_BUF. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
 #endif
 #if TCP_SNDLOWAT >= (0xFFFF - (4 * TCP_MSS))
   #error "lwip_sanity_check: WARNING: TCP_SNDLOWAT must at least be 4*MSS below u16_t overflow!"
 #endif
-#if TCP_SNDQUEUELOWAT >= TCP_SND_QUEUELEN
+#if TCP_SNDQUEUELOWAT >= TCP_SND_QUEUELEN(0)
   #error "lwip_sanity_check: WARNING: TCP_SNDQUEUELOWAT must be less than TCP_SND_QUEUELEN. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
 #endif
 #endif
diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index b8811813d..2e11bdd5c 100755
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -512,7 +512,7 @@ extern unsigned long os_random(void);
 /* Enable all Espressif-only options */
 
 #define ESP_LWIP                        1
-#define ESP_PER_SOC_TCP_WND             1
+#define ESP_PER_SOC_TCP_WND             0
 #define ESP_THREAD_SAFE                 1
 #define ESP_THREAD_SAFE_DEBUG           LWIP_DBG_OFF
 #define ESP_DHCP                        1
@@ -524,9 +524,10 @@ extern unsigned long os_random(void);
 #define ESP_LIGHT_SLEEP                 1
 
 
-#if ESP_PER_SOC_TCP_WND
 #define TCP_WND_DEFAULT                      (4*TCP_MSS)
 #define TCP_SND_BUF_DEFAULT                  (2*TCP_MSS)
+
+#if ESP_PER_SOC_TCP_WND
 #define TCP_WND(pcb)                         (pcb->per_soc_tcp_wnd)
 #define TCP_SND_BUF(pcb)                     (pcb->per_soc_tcp_snd_buf)
 #else