From d0782933b74a7afdcbbcf59d2e6a0ef0d8bf6116 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 15 Feb 2014 08:07:43 -0600 Subject: [PATCH] Back out part of write buffering change. David G reports that this causes problems connecting to a server --- ChangeLog | 3 +++ net/uip/uip_tcptimer.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a66774b9eb..177e9b084c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6581,4 +6581,7 @@ the SAM4L Xplained Pro configuration (2014-2-12). * arch/arm/src/stm32/stm32_serial.c: Fix cloned type: FLOWCONTROL vs FLOWCONROL (2014-2-14). + * net/uip/uip_tcptimer.c: Back out a small part of the 6.33 write + buffering changed. David G says that this causes problems in + connecting to a server (2014-2-15). diff --git a/net/uip/uip_tcptimer.c b/net/uip/uip_tcptimer.c index 48194f4476..fdd3a38a9e 100644 --- a/net/uip/uip_tcptimer.c +++ b/net/uip/uip_tcptimer.c @@ -134,8 +134,7 @@ void uip_tcptimer(struct uip_driver_s *dev, struct uip_conn *conn, int hsec) * retransmit. */ - if (conn->unacked > 0 && - (conn->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED) + if (conn->unacked > 0) { /* The connection has outstanding data */