diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-11-26 15:54:48 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-11-26 15:54:48 +0000 |
| commit | 879945fac82fa814e2aea7d3eda75174e8fb0bf2 (patch) | |
| tree | b0696d34ef1aae713a6f9a0ba72111de44759f62 /nuttx/net | |
| parent | b1e43c09bda98ba3caf419e99de6639170ce309a (diff) | |
| download | px4-nuttx-879945fac82fa814e2aea7d3eda75174e8fb0bf2.tar.gz px4-nuttx-879945fac82fa814e2aea7d3eda75174e8fb0bf2.tar.bz2 px4-nuttx-879945fac82fa814e2aea7d3eda75174e8fb0bf2.zip | |
Eliminate uip_outstanding()
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3134 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
| -rw-r--r-- | nuttx/net/uip/uip_tcpinput.c | 6 | ||||
| -rw-r--r-- | nuttx/net/uip/uip_tcptimer.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/net/uip/uip_tcpinput.c b/nuttx/net/uip/uip_tcpinput.c index f882ed1b9..a55b54d41 100644 --- a/nuttx/net/uip/uip_tcpinput.c +++ b/nuttx/net/uip/uip_tcpinput.c @@ -2,7 +2,7 @@ * net/uip/uip_tcpinput.c * Handling incoming TCP input * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Adapted for NuttX from logic in uIP which also has a BSD-like license: @@ -326,7 +326,7 @@ found: * retransmission timer. */ - if ((pbuf->flags & TCP_ACK) && uip_outstanding(conn)) + if ((pbuf->flags & TCP_ACK) != 0 && conn->len > 0) { uint32_t seqno; uint32_t ackno; @@ -533,7 +533,7 @@ found: if (pbuf->flags & TCP_FIN && !(conn->tcpstateflags & UIP_STOPPED)) { - if (uip_outstanding(conn)) + if (conn->len > 0) { goto drop; } diff --git a/nuttx/net/uip/uip_tcptimer.c b/nuttx/net/uip/uip_tcptimer.c index e1f7e20c2..4f993beeb 100644 --- a/nuttx/net/uip/uip_tcptimer.c +++ b/nuttx/net/uip/uip_tcptimer.c @@ -2,7 +2,7 @@ * net/uip/uip_tcptimer.c * Poll for the availability of TCP TX data * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Adapted for NuttX from logic in uIP which also has a BSD-like license: @@ -133,7 +133,7 @@ void uip_tcptimer(struct uip_driver_s *dev, struct uip_conn *conn, int hsec) * retransmit. */ - if (uip_outstanding(conn)) + if (conn->len > 0) { /* The connection has outstanding data */ |