summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-09-11 20:32:02 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-09-11 20:32:02 +0000
commit94e33b937211be75393f154a234ba254320312b5 (patch)
tree7ba98a7e4f651489bd1a8eba855d41c830b72555 /nuttx
parenta9fda6c0afe5659aa78c92f3b12d3d2bd38bba65 (diff)
downloadpx4-nuttx-94e33b937211be75393f154a234ba254320312b5.tar.gz
px4-nuttx-94e33b937211be75393f154a234ba254320312b5.tar.bz2
px4-nuttx-94e33b937211be75393f154a234ba254320312b5.zip
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
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/ChangeLog3
-rw-r--r--nuttx/Documentation/NuttX.html3
-rw-r--r--nuttx/net/uip/uip_tcppoll.c7
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 &lt;spudmonkey@racsa.co.cr&gt;
* 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 &lt;spudmonkey@racsa.co.cr&gt;
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 */