diff options
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/net/uip/uip_tcptimer.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index a66774b9e..177e9b084 100644 --- a/nuttx/ChangeLog +++ b/nuttx/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/nuttx/net/uip/uip_tcptimer.c b/nuttx/net/uip/uip_tcptimer.c index 48194f447..fdd3a38a9 100644 --- a/nuttx/net/uip/uip_tcptimer.c +++ b/nuttx/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 */ |