Merge branch 'feature/make_tcp_rto_configurable' into 'master'

jack0c · jack0c · commit 9f20d4113e07 · 2020-06-17T14:05:32.000+08:00
feat(lw-ip): make LW-IP TCP rto time configurable

Closes WIFI-2389

See merge request espressif/esp-idf!9091
diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
@@ -497,6 +497,13 @@ menu "LWIP"
             help
                 Enable this feature to support TCP window scaling.
 
+        config LWIP_TCP_RTO_TIME
+            int "Default TCP rto time"
+            default 3000
+            help
+                Set default TCP rto time for a reasonable initial rto.
+                In bad network environment, recommend set value of rto time to 1500.
+
     endmenu # TCP
 
     menu "UDP"
diff --git a/components/lwip/lwip b/components/lwip/lwip
@@ -1 +1 @@
-Subproject commit 50e4e0d1821a6e5deab0ead9f35ffb4e60625ea6
+Subproject commit 64b640ecae5a6ce510814944d75e9ff408d3fc8d
diff --git a/components/lwip/port/esp32/include/lwipopts.h b/components/lwip/port/esp32/include/lwipopts.h
@@ -400,6 +400,12 @@
 #define TCP_RCV_SCALE                   CONFIG_LWIP_TCP_RCV_SCALE
 #endif
 
+/**
+ * LWIP_TCP_RTO_TIME: TCP rto time.
+ * Default is 3 second.
+ */
+#define LWIP_TCP_RTO_TIME             CONFIG_LWIP_TCP_RTO_TIME
+
 /*
    ----------------------------------
    ---------- Pbuf options ----------
