From 5ef3e3e2158c8c65c1d76feaa5e62a60ad4dd8d3 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 30 May 2016 11:52:07 -0600
Subject: [PATCH] Replace confusing references to uIP with just 'the network'

---
 COPYING                                       |   2 +-
 Documentation/NuttxPortingGuide.html          |   3 +-
 Documentation/NuttxUserGuide.html             |   5 +-
 arch/README.txt                               | 209 ++++++------------
 arch/hc/src/m9s12/m9s12_ethernet.c            |  19 +-
 arch/mips/src/pic32mx/pic32mx-ethernet.c      |  25 ++-
 arch/mips/src/pic32mz/pic32mz-ethernet.c      |  25 ++-
 arch/z80/src/ez80/ez80_emac.c                 |  19 +-
 configs/dk-tm4c129x/src/tm4c_ethernet.c       |   2 +-
 configs/eagle100/src/lm_ethernet.c            |   2 +-
 configs/ekk-lm3s9b96/src/lm_ethernet.c        |   2 +-
 configs/lm3s6432-s2e/src/lm_ethernet.c        |   2 +-
 configs/lm3s6965-ek/src/lm_ethernet.c         |   2 +-
 configs/lm3s8962-ek/src/lm_ethernet.c         |   2 +-
 .../tm4c1294-launchpad/src/tm4c_ethernet.c    |   2 +-
 libc/netdb/lib_dnsquery.c                     |   4 +-
 16 files changed, 126 insertions(+), 199 deletions(-)

diff --git a/COPYING b/COPYING
index 1c82d0ca20..a8113ab027 100644
--- a/COPYING
+++ b/COPYING
@@ -93,7 +93,7 @@ has a similar BSD style license:
 IGMP
 ^^^^
 
-IGMP support, if enabled in uIP, adds additional logic by Steve Reynolds:
+IGMP support, if enabled, adds additional logic by Steve Reynolds:
 
   Copyright (c) 2002 CITEL Technologies Ltd.
   All rights reserved.
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index ff3990c9d9..9fc2e5e9e2 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -4901,8 +4901,7 @@ int kbd_decode(FAR struct lib_instream_s *stream, FAR struct kbd_getstate_s *sta
     <p>
     <b><code>include/nuttx/net/netdev.h</code></b>.
     All structures and APIs needed to work with Ethernet drivers are provided in this header file.
-    The structure <code>struct net_driver_s</code> defines the interface and is passed to uIP via
-    <code>netdev_register()</code>.
+    The structure <code>struct net_driver_s</code> defines the interface and is passed to the network via <code>netdev_register()</code>.
     </p>
   </li>
   <li>
diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html
index a91959e198..3766eba646 100644
--- a/Documentation/NuttxUserGuide.html
+++ b/Documentation/NuttxUserGuide.html
@@ -8755,9 +8755,8 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags, int fd, off_
 </table>
 
 <p>
-  NuttX includes a simple interface layer based on uIP (see <a href="http://www.sics.se/~adam/uip/index.php/Main_Page">http://www.sics.se</a>).
-  NuttX supports subset of a standard socket interface to uIP.
-  These network feature can be enabled by settings in the architecture <a href="NuttXConfigVariables.html">configuration file</a>.
+  NuttX supports a BSD-compatible socket interface layer.
+  These socket interface can be enabled by settings in the architecture <a href="NuttXConfigVariables.html">configuration file</a>.
   Those socket APIs are discussed in the following paragraphs.
 </p>
 <ul>
diff --git a/arch/README.txt b/arch/README.txt
index df34133df9..114f2f6f1e 100644
--- a/arch/README.txt
+++ b/arch/README.txt
@@ -134,6 +134,8 @@ src/Makefile
 
 Supported Architectures
 ^^^^^^^^^^^^^^^^^^^^^^^
+NOTE: nuttx/Documentation/NuttX.html for current information about the
+state of these MCU ports.
 
 arch/sim - Linux/Cygwin simulation
     A user-mode port of NuttX to the x86 Linux platform is available.
@@ -145,135 +147,68 @@ arch/arm - ARM-based micro-controllers
     This directory holds common ARM architectures.  At present, this includes
     the following subdirectories:
 
-    arch/arm/include and arch/arm/src/common
-        Common ARM/Cortex-M3 logic.
+    Architecture Support
+      arch/arm/include and arch/arm/src/common
+      arch/arm/src/arm and arch/arm/include/arm
+      arch/arm/src/armv7-a and arch/arm/include/armv7-a
+      arch/arm/src/armv7-m and arch/arm/include/armv7-m
+      arch/arm/src/armv7-r and arch/arm/include/armv7-4
 
-    arch/arm/src/arm and arch/arm/include/arm
-        Common ARM-specific logic
-
-    arch/arm/src/armv7-m and arch/arm/include/armv7-m
-        Common ARMv7-M logic (Cortex-M3 and Cortex-M4)
-
-    arch/arm/include/c5471 and arch/arm/src/c5471
-        TI TMS320C5471 (also called TMS320DM180 or just C5471).
-        NuttX operates on the ARM7 of this dual core processor. This port
-        complete, verified, and included in the NuttX release 0.1.1.
-
-    arch/arm/include/calypso and arch/arm/src/calypso
-        TI "Calypso" MCU used in various cell phones (and, in particular,
-        by the Osmocom-bb project).  Like the c5471, NuttX operates on the
-        ARM7 of this dual core processor. This port was contributed by
-        Denis Carilki and includes the work of Denis, Alan Carvalho de Assis,
-        and Stefan Richter.  Calypso support first appeared in NuttX-6.17.
-
-    arch/arm/include/dm320 and arch/arm/src/dm320
-        TI TMS320DM320 (also called just DM320).
-        NuttX operates on the ARM9EJS of this dual core processor.  This port
-        complete, verified, and included in the NuttX release 0.2.1.
-
-    arch/arm/include/imx and arch/arm/src/imx
-        Freescale MC9328MX1 or i.MX1. This port uses the Freescale MX1ADS
-        development board with a GNU arm-elf toolchain* under either Linux or Cygwin.
-        STATUS: This port has stalled because of development tool issues. Coding
-        is complete on the basic port (timer, serial console, SPI).
-
-    arch/arm/include/lm and arch/arm/src/lm
-        These directories contain support for the Luminary LM3S/4F family. The
-        initial, release of this port was included in NuttX version 0.4.6.  The
-        current port includes timer, serial console, Ethernet, SSI, and microSD
-        support. There are working configurations the NuttX OS test, to run the
-        NuttShell (NSH), the NuttX networking test, and the uIP web server.
-
-    arch/arm/include/lpc214x and arch/arm/src/lpc214x
-        These directories provide support for NXP LPC214x family of
-        ARM7TDMI processors.  This port boots and passes the OS test (examples/ostest).
-        The port is complete and verifed.  As of NuttX 0.3.17, the port includes:
-        timer interrupts, serial console, USB driver, and SPI-based MMC/SD card
-        support.  A verifed NuttShell (NSH) configuration is also available.
-
-    arch/arm/include/lpc2378 and arch/arm/src/lpc2378.
-        NXP LPC2378. Support is provided for the NXP LPC2378 MCU. This port was
-        contributed by Rommel Marcelo is was first released in NuttX-5.3.
-        STATUS: This port boots and passes the OS test (examples/ostest) and
-        includes a working implementation of the NuttShell (NSH). The port is
-        complete and verified. As of NuttX 5.3, the port includes only basic
-        timer interrupts and serial console support.
-
-    arch/arm/include/lpc31xx and arch/arm/src/lpc31xx
-        These directories provide support for NXP LPC31xx family of
-        ARM926EJ-S processors.  The port for the NXP LPC3131 was first
-        released in NuttX-5.1 (but was not functional until NuttX-5.2).
-        STATUS: The basic EA3131 port is complete and verified in NuttX-5.2
-        This basic port includes basic boot-up, serial console, and timer
-        interrupts. This port was extended in NuttX 5.3 with a USB high
-        speed driver contributed by David Hewson. This port has been
-        verified using the NuttX OS test, USB serial and mass storage tests
-        and includes a working implementation of the NuttShell ((NSH)).
-
-        This port was later extended to support additional members of the
-        LPC31xx family including, specifically, the LPC3152.
-
-    arch/arm/include/sam3u and arch/arm/src/sam3u
-        Atmel AT91SAM3U. This port is for Atmel AT91SAM3U4E MCU.
-        STATUS: The basic AT91SAM3U port was released in NuttX version 5.1.
-        The basic port includes boot-up logic, interrupt driven serial
-        console, and system timer interrupts. That release passes the
-        NuttX OS test and is proven to have a valid OS implementation. A
-        onfiguration to support the NuttShell is also included.
-
-    arch/arm/include/stm32 and arch/arm/src/stm32
-        These directories contain support for the STMicro STM32 F1, F2, and
-        F4 families.
-
-        STATUS: The basic STM32 F1 port was released in NuttX version 0.4.12.
-        and has continued to develop consistently over time.  It now includes
-        support for the F2 and F4 families and a rich offering of peripheral
-        drivers.
-
-    arch/arm/include/str71x and arch/arm/src/str71x
-        These directories provide support for the STMicro STR71x processors.
-        Coding is complete on the basic port (boot logic, system time, serial console),
-        but no testing has been performed due to some problems I am having with my
-        JTAG wiggler and OpenOCD on Linux.
+    MCU support
+      arch/arm/include/c5471 and arch/arm/src/c5471
+      arch/arm/include/calypso and arch/arm/src/calypso
+      arch/arm/include/dm320 and arch/arm/src/dm320
+      arch/arm/include/efm32 and arch/arm/src/efm32
+      arch/arm/include/imx1 and arch/arm/src/imx1
+      arch/arm/include/imx6 and arch/arm/src/imx6
+      arch/arm/include/kinetis and arch/arm/src/kinetis
+      arch/arm/include/kl and arch/arm/src/kl
+      arch/arm/include/lpc11xx and arch/arm/src/lpc11xx
+      arch/arm/include/lpc17xx and arch/arm/src/lpc17xx
+      arch/arm/include/lpc214x and arch/arm/src/lpc214x
+      arch/arm/include/lpc2378 and arch/arm/src/lpc2378.
+      arch/arm/include/lpc31xx and arch/arm/src/lpc31xx
+      arch/arm/include/lpc43xx and arch/arm/src/lpc43xx
+      arch/arm/include/moxart and arch/arm/src/moxart
+      arch/arm/include/nuc1xx and arch/arm/src/nuc1xx
+      arch/arm/include/sam34 and arch/arm/src/sam34
+      arch/arm/include/sama45 and arch/arm/src/sama5
+      arch/arm/include/samdl and arch/arm/src/samdl
+      arch/arm/include/samv7 and arch/arm/src/samv7
+      arch/arm/include/stm32 and arch/arm/src/stm32
+      arch/arm/include/stm32f7 and arch/arm/src/stm32f7
+      arch/arm/include/stm32l4 and arch/arm/src/stm32l4
+      arch/arm/include/str71x and arch/arm/src/str71x
+      arch/arm/include/tiva and arch/arm/src/tiva
+      arch/arm/include/tms570 and arch/arm/src/tms570
 
 arch/avr
     This directory is dedicated to ports to the Atmel AVR (8-bit) and AVR32 (32-bit)
     MCU families.  STATUS:  Under development.
 
-    arch/avr/include/avr and arch/avr/src/avr
-      Common support for all 8-bit AVR MCUs
+    Architecture Support
+      arch/avr/include/avr and arch/avr/src/avr
+      arch/avr/include/avr32 and arch/avr/src/avr32
 
-    arch/avr/include/atmega and arch/avr/src/atmega
-      Support specifically for the AVR ATMega family (specifically only for
-      the ATMega128 at the moment).
-
-    arch/avr/include/at90usb and arch/avr/src/at90usb
-      Support specifically for the AVR AT90USB646, 647, 1286, and 1287 family.
-
-    arch/avr/include/avr32 and arch/avr/src/avr32
-      Common support for all AVR32 MCUs
-
-    arch/avr/include/at32uc3 and arch/avr/src/at32uc3
-      Support specifically for the AT32UC3Bxxx family (specifically only for
-      the AT32UC3B0256 at the moment).
+    MCU support
+      arch/avr/include/atmega and arch/avr/src/atmega
+      arch/avr/include/at90usb and arch/avr/src/at90usb
+      arch/avr/include/at32uc3 and arch/avr/src/at32uc3
 
 arch/hc
     This directory is dedicated to ports to the Freescale HC family.
 
     arch/arm/include/m9s12 and arch/arm/src/m9s12
-      These directories provide support for the Freescale mc9s12x family.
-      STATUS:  Fragments of this port were first released in nuttx-5.0 and
-      the port was "code-complete" as nuttx-5.18.  However, the final
-      verification effort has been stalled because of higher priority tasks.
 
 arch/mips
     This directory is dedicated to ports to the MIPS family.
 
-    arch/mips/include/mips32 and arch/mips/src/mips32
-      Common support for all MIPS32 architectures
+    Architecture Support
+      arch/mips/include/mips32 and arch/mips/src/mips32
 
-    arch/mips/include/pic32mx and arch/mips/src/pic32mx
-      Support for all MicroChip PIC32MX architectures
+    MCU support
+      arch/mips/include/pic32mx and arch/mips/src/pic32mx
+      arch/mips/include/pic32mz and arch/mips/src/pic32mz
 
 arch/rgmp
 
@@ -288,52 +223,42 @@ arch/rgmp
 
 arch/sh - SuperH and related Hitachi/Renesas microcontrollers
 
-    arch/sh/include and arch/sh/src/common
-        Common SuperH logic.
+    Architecture Support
+      arch/sh/include and arch/sh/src/common
 
-    arch/sh/include/shs and arch/sh/src/sh1
-        Support for the SH-1 processor.
+    MCU support
+      arch/sh/include/m16c and arch/sh/src/m16c
+      arch/sh/include/sh1 and arch/sh/src/sh1
 
 arch/x86 - Intel x86 architectures
     This directory holds related, 32- and 64-bit architectures from Intel.
     At present, this includes the following subdirectories:
 
-    arch/x86/include and arch/x86/src/common
-        Common x86 logic.
+    Architecture Support
+      arch/x86/include and arch/x86/src/common
 
-    arch/x86/include/i486 and arch/x86/src/i486
-        These directories hold definitions and logic appropriate for any
-        instantiation of the 32-bit i486 architecture.
-
-    arch/x86/include/qemu and arch/x86/src/qemu
-        This is the implementation of NuttX on the QEMU x86 simulation.
+    MCU support
+      arch/x86/include/i486 and arch/x86/src/i486
+      arch/x86/include/qemu and arch/x86/src/qemu
 
 arch/z16 - ZiLOG 16-bit processors
     This directory holds related, 16-bit architectures from ZiLOG.  At
     present, this includes the following subdirectories:
 
-    arch/z16/include and arch/z16/src/common
-        Common microcontroller logic.
+    Architecture Support
+      arch/z16/include and arch/z16/src/common
 
-    arch/z16/include/z16f and arch/z16/src/z16f
-        ZiLOG z16f Microcontroller.
-        STATUS: Released in nuttx-0.3.7.  Fully functional other than issues
-        addressed in ${TOPDIR}/TODO.
+    MCU support
+      arch/z16/include/z16f and arch/z16/src/z16f
 
 arch/z80 - ZiLOG 8-bit microcontrollers
     This directory holds related, 8-bit architectures from ZiLOG.  At
     present, this includes the following subdirectories:
 
-    arch/z80/include and arch/z80/src/common
-        Common microcontroller logic.
+    Architecture Support
+      arch/z80/include and arch/z80/src/common
 
-    arch/z80/include/z80 and arch/z80/src/z80
-        Classic ZiLOG z80 Microcontroller.
-        STATUS: Functional with no known defects.  There are still several
-         OS features that have not yet been tested (e.g., networking).
-
-    arch/z80/include/z8 and arch/z80/src/z8
-        ZiLOG Z8Encore! Microcontroller
-
-    arch/z80/include/ez80 and arch/z80/src/ez80
-        ZiLOG ez80 Acclaim! Microcontroller
+    MCU support
+      arch/z80/include/z80 and arch/z80/src/z80
+      arch/z80/include/z8 and arch/z80/src/z8
+      arch/z80/include/ez80 and arch/z80/src/ez80
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index 0f02c88aed..ad3e1ef6b8 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -97,9 +97,9 @@ struct emac_driver_s
   WDOG_ID d_txpoll;           /* TX poll timer */
   WDOG_ID d_txtimeout;        /* TX timeout timer */
 
-  /* This holds the information visible to uIP/NuttX */
+  /* This holds the information visible to the NuttX network */
 
-  struct net_driver_s d_dev;  /* Interface understood by uIP */
+  struct net_driver_s d_dev;  /* Interface understood by the network */
 };
 
 /****************************************************************************
@@ -185,8 +185,9 @@ static int emac_transmit(FAR struct emac_driver_s *priv)
  * Function: emac_txpoll
  *
  * Description:
- *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
+ *   The transmitter is available, check if the network has any outgoing
+ *   packets ready to send.  This is a callback from devif_poll().
+ *   devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -276,7 +277,7 @@ static void emac_receive(FAR struct emac_driver_s *priv)
     {
       /* Check for errors and update statistics */
 
-      /* Check if the packet is a valid size for the uIP buffer configuration */
+      /* Check if the packet is a valid size for the network buffer configuration */
 
       /* Copy the data data from the hardware to priv->d_dev.d_buf.  Set
        * amount of data in priv->d_dev.d_len
@@ -413,7 +414,7 @@ static void emac_txdone(FAR struct emac_driver_s *priv)
 
   wd_cancel(priv->d_txtimeout);
 
-  /* Then poll uIP for new XMIT data */
+  /* Then poll the network for new XMIT data */
 
   (void)devif_poll(&priv->d_dev, emac_txpoll);
 }
@@ -484,7 +485,7 @@ static void emac_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then reset the hardware */
 
-  /* Then poll uIP for new XMIT data */
+  /* Then poll the network for new XMIT data */
 
   (void)devif_poll(&priv->d_dev, emac_txpoll);
 }
@@ -515,7 +516,7 @@ static void emac_polltimer(int argc, uint32_t arg, ...)
    * the TX poll if he are unable to accept another packet for transmission.
    */
 
-  /* If so, update TCP timing states and poll uIP for new XMIT data. Hmmm..
+  /* If so, update TCP timing states and poll the network for new XMIT data. Hmmm..
    * might be bug here.  Does this mean if there is a transmit in progress,
    * we will missing TCP time state updates?
    */
@@ -644,7 +645,7 @@ static int emac_txavail(struct net_driver_s *dev)
     {
       /* Check if there is room in the hardware to hold another outgoing packet. */
 
-      /* If so, then poll uIP for new XMIT data */
+      /* If so, then poll the network for new XMIT data */
 
       (void)devif_poll(&priv->d_dev, emac_txpoll);
     }
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index eae7719bd4..4c11f5c660 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -319,9 +319,9 @@ struct pic32mx_driver_s
 
   sq_queue_t pd_freebuffers;    /* The free buffer list */
 
-  /* This holds the information visible to uIP/NuttX */
+  /* This holds the information visible to the NuttX network */
 
-  struct net_driver_s pd_dev;  /* Interface understood by uIP */
+  struct net_driver_s pd_dev;  /* Interface understood by the network */
 
   /* Descriptors and packet buffers */
 
@@ -1024,7 +1024,7 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv)
 
   /* Find the next available TX descriptor.  We are guaranteed that is will
    * not fail by upstream logic that assures that a TX packet is available
-   * before polling uIP.
+   * before polling the network.
    */
 
   txdesc = pic32mx_txdesc(priv);
@@ -1080,8 +1080,9 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv)
  * Function: pic32mx_txpoll
  *
  * Description:
- *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
+ *   The transmitter is available, check if the network has any outgoing
+ *   packets ready to send.  This is a callback from devif_poll().
+ *   devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1172,7 +1173,7 @@ static int pic32mx_txpoll(struct net_driver_s *dev)
  * Function: pic32mx_poll
  *
  * Description:
- *   Perform the uIP poll.
+ *   Perform the network poll.
  *
  * Parameters:
  *   priv  - Reference to the driver state structure
@@ -1220,7 +1221,7 @@ static void pic32mx_poll(struct pic32mx_driver_s *priv)
  * Function: pic32mx_timerpoll
  *
  * Description:
- *   Perform the uIP timer poll.
+ *   Perform the network timer poll.
  *
  * Parameters:
  *   priv  - Reference to the driver state structure
@@ -1634,11 +1635,11 @@ static void pic32mx_txdone(struct pic32mx_driver_s *priv)
       pic32mx_putreg(priv->pd_inten, PIC32MX_ETH_IEN);
     }
 
-  /* Otherwise poll uIP for new XMIT data */
+  /* Otherwise poll the network for new XMIT data */
 
   else
     {
-      /* Perform the uIP poll */
+      /* Perform the network poll */
 
       pic32mx_poll(priv);
     }
@@ -1848,7 +1849,7 @@ static void pic32mx_txtimeout(int argc, uint32_t arg, ...)
 
       (void)pic32mx_ifup(&priv->pd_dev);
 
-      /* Then poll uIP for new XMIT data (We are guaranteed to have a free
+      /* Then poll the network for new XMIT data (We are guaranteed to have a free
        * buffer here).
        */
 
@@ -1884,7 +1885,7 @@ static void pic32mx_polltimer(int argc, uint32_t arg, ...)
 
   if (pic32mx_txdesc(priv) != NULL)
     {
-      /* If so, update TCP timing states and poll uIP for new XMIT data. Hmmm..
+      /* If so, update TCP timing states and poll the network for new XMIT data. Hmmm..
        * might be bug here.  Does this mean if there is a transmit in progress,
        * we will missing TCP time state updates?
        */
@@ -2281,7 +2282,7 @@ static int pic32mx_txavail(struct net_driver_s *dev)
 
       if (pic32mx_txdesc(priv) != NULL)
         {
-          /* If so, then poll uIP for new XMIT data.  First allocate a buffer
+          /* If so, then poll the network for new XMIT data.  First allocate a buffer
            * to perform the poll
            */
 
diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c
index 6b45f1ea02..7d531efde9 100644
--- a/arch/mips/src/pic32mz/pic32mz-ethernet.c
+++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c
@@ -337,9 +337,9 @@ struct pic32mz_driver_s
 
   sq_queue_t pd_freebuffers;    /* The free buffer list */
 
-  /* This holds the information visible to uIP/NuttX */
+  /* This holds the information visible to the NuttX network */
 
-  struct net_driver_s pd_dev;  /* Interface understood by uIP */
+  struct net_driver_s pd_dev;  /* Interface understood by the network */
 
   /* Descriptors and packet buffers */
 
@@ -1042,7 +1042,7 @@ static int pic32mz_transmit(struct pic32mz_driver_s *priv)
 
   /* Find the next available TX descriptor.  We are guaranteed that is will
    * not fail by upstream logic that assures that a TX packet is available
-   * before polling uIP.
+   * before polling the network.
    */
 
   txdesc = pic32mz_txdesc(priv);
@@ -1098,8 +1098,9 @@ static int pic32mz_transmit(struct pic32mz_driver_s *priv)
  * Function: pic32mz_txpoll
  *
  * Description:
- *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
+ *   The transmitter is available, check if the network has any outgoing
+ *   packets ready to send.  This is a callback from devif_poll().
+ *   devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1190,7 +1191,7 @@ static int pic32mz_txpoll(struct net_driver_s *dev)
  * Function: pic32mz_poll
  *
  * Description:
- *   Perform the uIP poll.
+ *   Perform the network poll.
  *
  * Parameters:
  *   priv  - Reference to the driver state structure
@@ -1238,7 +1239,7 @@ static void pic32mz_poll(struct pic32mz_driver_s *priv)
  * Function: pic32mz_timerpoll
  *
  * Description:
- *   Perform the uIP timer poll.
+ *   Perform the network timer poll.
  *
  * Parameters:
  *   priv  - Reference to the driver state structure
@@ -1651,11 +1652,11 @@ static void pic32mz_txdone(struct pic32mz_driver_s *priv)
       pic32mz_putreg(priv->pd_inten, PIC32MZ_ETH_IEN);
     }
 
-  /* Otherwise poll uIP for new XMIT data */
+  /* Otherwise poll the network for new XMIT data */
 
   else
     {
-      /* Perform the uIP poll */
+      /* Perform the network poll */
 
       pic32mz_poll(priv);
     }
@@ -1865,7 +1866,7 @@ static void pic32mz_txtimeout(int argc, uint32_t arg, ...)
 
       (void)pic32mz_ifup(&priv->pd_dev);
 
-      /* Then poll uIP for new XMIT data (We are guaranteed to have a free
+      /* Then poll the network for new XMIT data (We are guaranteed to have a free
        * buffer here).
        */
 
@@ -1901,7 +1902,7 @@ static void pic32mz_polltimer(int argc, uint32_t arg, ...)
 
   if (pic32mz_txdesc(priv) != NULL)
     {
-      /* If so, update TCP timing states and poll uIP for new XMIT data. Hmmm..
+      /* If so, update TCP timing states and poll the network for new XMIT data. Hmmm..
        * might be bug here.  Does this mean if there is a transmit in progress,
        * we will missing TCP time state updates?
        */
@@ -2304,7 +2305,7 @@ static int pic32mz_txavail(struct net_driver_s *dev)
 
       if (pic32mz_txdesc(priv) != NULL)
         {
-          /* If so, then poll uIP for new XMIT data.  First allocate a buffer
+          /* If so, then poll the network for new XMIT data.  First allocate a buffer
            * to perform the poll
            */
 
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index 2b1b5834fe..0584aa0464 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -325,9 +325,9 @@ struct ez80emac_driver_s
   struct ez80mac_statistics_s stat;
 #endif
 
-  /* This holds the information visible to uIP/NuttX */
+  /* This holds the information visible to the NuttX network */
 
-  struct net_driver_s dev;  /* Interface understood by uIP */
+  struct net_driver_s dev;  /* Interface understood by the network */
 };
 
 /****************************************************************************
@@ -1055,8 +1055,9 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv)
  * Function: ez80emac_txpoll
  *
  * Description:
- *   The transmitter is available, check if uIP has any outgoing packets ready
- *   to send.  This is a callback from devif_poll().  devif_poll() may be called:
+ *   The transmitter is available, check if the network has any outgoing
+ *   packets ready to send.  This is a callback from devif_poll().
+ *   devif_poll() may be called:
  *
  *   1. When the preceding TX packet send is complete,
  *   2. When the preceding TX packet send timesout and the interface is reset
@@ -1228,7 +1229,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
         }
 
       /* We have a good packet. Check if the packet is a valid size
-       * for the uIP buffer configuration (I routinely see
+       * for the network buffer configuration (I routinely see
        */
 
       if (rxdesc->pktsize > CONFIG_NET_ETH_MTU)
@@ -1669,7 +1670,7 @@ static void ez80emac_txtimeout(int argc, uint32_t arg, ...)
   ez80emac_ifup(&priv->dev);
   leave_critical_section(flags);
 
-  /* Then poll uIP for new XMIT data */
+  /* Then poll the network for new XMIT data */
 
   (void)devif_poll(&priv->dev, ez80emac_txpoll);
 }
@@ -1695,7 +1696,7 @@ static void ez80emac_polltimer(int argc, uint32_t arg, ...)
 {
   struct ez80emac_driver_s *priv = (struct ez80emac_driver_s *)arg;
 
-  /* Poll uIP for new XMIT data */
+  /* Poll the network for new XMIT data */
 
   (void)devif_timer(&priv->dev, ez80emac_txpoll);
 
@@ -1882,7 +1883,7 @@ static int ez80emac_txavail(struct net_driver_s *dev)
 
       /* Check if there is room in the hardware to hold another outgoing packet. */
 
-      /* If so, then poll uIP for new XMIT data */
+      /* If so, then poll the network for new XMIT data */
 
       (void)devif_poll(&priv->dev, ez80emac_txpoll);
     }
@@ -2256,7 +2257,7 @@ errout:
  *   Add one MAC address to the multi-cast hash table
  *
  * Parameters:
- *   dev    - Reference to the uIP driver state structure
+ *   dev    - Reference to the network driver state structure
  *   mac    - The MAC address to add
  *   enable - true: Enable filtering on this address; false: disable
  *
diff --git a/configs/dk-tm4c129x/src/tm4c_ethernet.c b/configs/dk-tm4c129x/src/tm4c_ethernet.c
index 9394a4522b..8594d75559 100644
--- a/configs/dk-tm4c129x/src/tm4c_ethernet.c
+++ b/configs/dk-tm4c129x/src/tm4c_ethernet.c
@@ -87,7 +87,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
-  /* Re-format that MAC address the way that uIP expects to see it */
+  /* Re-format that MAC address the way that the network expects to see it */
 
   ethaddr->ether_addr_octet[0] = ((user0 >>  0) & 0xff);
   ethaddr->ether_addr_octet[1] = ((user0 >>  8) & 0xff);
diff --git a/configs/eagle100/src/lm_ethernet.c b/configs/eagle100/src/lm_ethernet.c
index 62f073697c..7a33e1af6c 100644
--- a/configs/eagle100/src/lm_ethernet.c
+++ b/configs/eagle100/src/lm_ethernet.c
@@ -86,7 +86,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
-  /* Re-format that MAC address the way that uIP expects to see it */
+  /* Re-format that MAC address the way that the network expects to see it */
 
   ethaddr->ether_addr_octet[0] = ((user0 >>  0) & 0xff);
   ethaddr->ether_addr_octet[1] = ((user0 >>  8) & 0xff);
diff --git a/configs/ekk-lm3s9b96/src/lm_ethernet.c b/configs/ekk-lm3s9b96/src/lm_ethernet.c
index 622a972b3e..c3627e4a16 100644
--- a/configs/ekk-lm3s9b96/src/lm_ethernet.c
+++ b/configs/ekk-lm3s9b96/src/lm_ethernet.c
@@ -87,7 +87,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
-  /* Re-format that MAC address the way that uIP expects to see it */
+  /* Re-format that MAC address the way that the network expects to see it */
 
   ethaddr->ether_addr_octet[0] = ((user0 >>  0) & 0xff);
   ethaddr->ether_addr_octet[1] = ((user0 >>  8) & 0xff);
diff --git a/configs/lm3s6432-s2e/src/lm_ethernet.c b/configs/lm3s6432-s2e/src/lm_ethernet.c
index 2d6bb5a088..c10d261adc 100644
--- a/configs/lm3s6432-s2e/src/lm_ethernet.c
+++ b/configs/lm3s6432-s2e/src/lm_ethernet.c
@@ -86,7 +86,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
-  /* Re-format that MAC address the way that uIP expects to see it */
+  /* Re-format that MAC address the way that the network expects to see it */
 
   ethaddr->ether_addr_octet[0] = ((user0 >>  0) & 0xff);
   ethaddr->ether_addr_octet[1] = ((user0 >>  8) & 0xff);
diff --git a/configs/lm3s6965-ek/src/lm_ethernet.c b/configs/lm3s6965-ek/src/lm_ethernet.c
index 6d4d62f5fa..4a467dd459 100644
--- a/configs/lm3s6965-ek/src/lm_ethernet.c
+++ b/configs/lm3s6965-ek/src/lm_ethernet.c
@@ -86,7 +86,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
-  /* Re-format that MAC address the way that uIP expects to see it */
+  /* Re-format that MAC address the way that the network expects to see it */
 
   ethaddr->ether_addr_octet[0] = ((user0 >>  0) & 0xff);
   ethaddr->ether_addr_octet[1] = ((user0 >>  8) & 0xff);
diff --git a/configs/lm3s8962-ek/src/lm_ethernet.c b/configs/lm3s8962-ek/src/lm_ethernet.c
index fb5db9e152..a6d4da70e9 100644
--- a/configs/lm3s8962-ek/src/lm_ethernet.c
+++ b/configs/lm3s8962-ek/src/lm_ethernet.c
@@ -86,7 +86,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
-  /* Re-format that MAC address the way that uIP expects to see it */
+  /* Re-format that MAC address the way that the network expects to see it */
 
   ethaddr->ether_addr_octet[0] = ((user0 >>  0) & 0xff);
   ethaddr->ether_addr_octet[1] = ((user0 >>  8) & 0xff);
diff --git a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
index f668660342..3b70b23853 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
@@ -87,7 +87,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
-  /* Re-format that MAC address the way that uIP expects to see it */
+  /* Re-format that MAC address the way that the network expects to see it */
 
   ethaddr->ether_addr_octet[0] = ((user0 >>  0) & 0xff);
   ethaddr->ether_addr_octet[1] = ((user0 >>  8) & 0xff);
diff --git a/libc/netdb/lib_dnsquery.c b/libc/netdb/lib_dnsquery.c
index 54a5046fab..c29437c7b2 100644
--- a/libc/netdb/lib_dnsquery.c
+++ b/libc/netdb/lib_dnsquery.c
@@ -2,8 +2,8 @@
  * libc/netdb/lib_dnsquery.c
  * DNS host name to IP address resolver.
  *
- * The uIP DNS resolver functions are used to lookup a hostname and
- * map it to a numerical IP address.
+ * The DNS resolver functions are used to lookup a hostname and map it to a
+ * numerical IP address.
  *
  *   Copyright (C) 2007, 2009, 2012, 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>