diff options
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 3 | ||||
| -rw-r--r-- | nuttx/net/uip/uip_tcppoll.c | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 93150d588..7269302d6 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -863,3 +863,6 @@ * net/net_close.c. Fixed another important TCP/IP race condition bug: If the host closes the TCP connection just before the target calls close(), then the close operation may hang indefinitely! + * net/net_tcppoll.c. Removed an unnecessary check for outstanding, un-ACKed + data. The NuttX socket layer keeps track of ACKs and doesn't need this check; + removing the check should improve write throughput diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 9c7269825..fdc628d49 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -1524,6 +1524,9 @@ nuttx-0.4.11 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * net/net_close.c. Fixed another important TCP/IP race condition bug: If the host closes the TCP connection just before the target calls close(), then the close operation may hang indefinitely! + * net/net_tcppoll.c. Removed an unnecessary check for outstanding, un-ACKed + data. The NuttX socket layer keeps track of ACKs and doesn't need this check; + removing the check should improve write throughput pascal-0.1.3 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/net/uip/uip_tcppoll.c b/nuttx/net/uip/uip_tcppoll.c index b851ba167..e64ea2935 100644 --- a/nuttx/net/uip/uip_tcppoll.c +++ b/nuttx/net/uip/uip_tcppoll.c @@ -96,12 +96,9 @@ void uip_tcppoll(struct uip_driver_s *dev, struct uip_conn *conn) { uint8 result; - /* Verify that the connection is established and if the connection has - * no outstanding (unacknowledged) sent data. - */ + /* Verify that the connection is established */ - if ((conn->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED && - !uip_outstanding(conn)) + if ((conn->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED) { /* Set up for the callback */ |