diff --git a/include/net/uip/uip-tcp.h b/include/net/uip/uip-tcp.h
index 935f19ce757..67d051fcf14 100644
--- a/include/net/uip/uip-tcp.h
+++ b/include/net/uip/uip-tcp.h
@@ -6,7 +6,7 @@
  * of C macros that are used by uIP programs as well as internal uIP
  * structures, TCP/IP header structures and function declarations.
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
@@ -379,10 +379,6 @@ extern int uip_listen(struct uip_conn *conn);
 
 extern int uip_unlisten(struct uip_conn *conn);
 
-/* Check if a connection has outstanding (i.e., unacknowledged) data */
-
-#define uip_outstanding(conn) ((conn)->len)
-
 /* Access to TCP read-ahead buffers */
 
 #if CONFIG_NET_NTCP_READAHEAD_BUFFERS > 0
diff --git a/net/uip/uip_tcpinput.c b/net/uip/uip_tcpinput.c
index f882ed1b9c9..a55b54d417a 100644
--- a/net/uip/uip_tcpinput.c
+++ b/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/net/uip/uip_tcptimer.c b/net/uip/uip_tcptimer.c
index e1f7e20c277..4f993beeb83 100644
--- a/net/uip/uip_tcptimer.c
+++ b/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 */