From 44f3418b1816956510d180b0d0205c9e7eb3178f Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 11 Sep 2009 20:32:02 +0000 Subject: [PATCH] Remove check for outstanding un-ACKed data in TX poll git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2038 42af7a65-404d-4744-a932-0658087f49c3 --- ChangeLog | 3 +++ Documentation/NuttX.html | 3 +++ net/uip/uip_tcppoll.c | 7 ++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93150d588a..7269302d63 100644 --- a/ChangeLog +++ b/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/Documentation/NuttX.html b/Documentation/NuttX.html index 9c7269825f..fdc628d49c 100644 --- a/Documentation/NuttX.html +++ b/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/net/uip/uip_tcppoll.c b/net/uip/uip_tcppoll.c index b851ba1672..e64ea2935a 100644 --- a/net/uip/uip_tcppoll.c +++ b/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 */