From 400edda109e8bd201872ea3a5eb75bb18af60275 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 1 Jul 2014 18:41:08 -0600
Subject: [PATCH] NET: Rename XYZ_uiptxpoll to just XYZ_txpoll

---
 arch/arm/src/c5471/c5471_ethernet.c      | 14 +++++++-------
 arch/arm/src/kinetis/kinetis_enet.c      | 14 +++++++-------
 arch/arm/src/lpc17xx/lpc17_ethernet.c    | 14 +++++++-------
 arch/arm/src/sam34/sam_emac.c            | 10 +++++-----
 arch/arm/src/sama5/sam_emaca.c           | 10 +++++-----
 arch/arm/src/sama5/sam_emacb.c           | 10 +++++-----
 arch/arm/src/sama5/sam_gmac.c            | 10 +++++-----
 arch/arm/src/stm32/stm32_eth.c           | 10 +++++-----
 arch/arm/src/tiva/tiva_ethernet.c        | 14 +++++++-------
 arch/hc/src/m9s12/m9s12_ethernet.c       | 14 +++++++-------
 arch/mips/src/pic32mx/pic32mx-ethernet.c | 10 +++++-----
 arch/sim/src/up_uipdriver.c              |  4 ++--
 arch/z80/src/ez80/ez80_emac.c            | 12 ++++++------
 drivers/net/cs89x0.c                     | 14 +++++++-------
 drivers/net/dm90x0.c                     | 14 +++++++-------
 drivers/net/e1000.c                      | 14 +++++++-------
 drivers/net/enc28j60.c                   | 14 +++++++-------
 drivers/net/encx24j600.c                 | 14 +++++++-------
 drivers/net/skeleton.c                   | 14 +++++++-------
 drivers/net/slip.c                       |  8 ++++----
 drivers/net/vnet.c                       | 14 +++++++-------
 21 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index cd29b20611..dcef92518c 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -359,7 +359,7 @@ static inline void c5471_incrxcpu(struct c5471_driver_s *c5471);
 /* Common TX logic */
 
 static int  c5471_transmit(struct c5471_driver_s *c5471);
-static int  c5471_uiptxpoll(struct net_driver_s *dev);
+static int  c5471_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -954,7 +954,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471)
 }
 
 /****************************************************************************
- * Function: c5471_uiptxpoll
+ * Function: c5471_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -974,7 +974,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471)
  *
  ****************************************************************************/
 
-static int c5471_uiptxpoll(struct net_driver_s *dev)
+static int c5471_txpoll(struct net_driver_s *dev)
 {
   struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private;
 
@@ -1403,7 +1403,7 @@ static void c5471_txdone(struct c5471_driver_s *c5471)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&c5471->c_dev, c5471_uiptxpoll);
+  (void)devif_poll(&c5471->c_dev, c5471_txpoll);
 }
 
 /****************************************************************************
@@ -1522,7 +1522,7 @@ static void c5471_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&c5471->c_dev, c5471_uiptxpoll);
+  (void)devif_poll(&c5471->c_dev, c5471_txpoll);
 }
 
 /****************************************************************************
@@ -1554,7 +1554,7 @@ static void c5471_polltimer(int argc, uint32_t arg, ...)
     {
       /* If so, update TCP timing states and poll uIP for new XMIT data */
 
-      (void)devif_timer(&c5471->c_dev, c5471_uiptxpoll, C5471_POLLHSEC);
+      (void)devif_timer(&c5471->c_dev, c5471_txpoll, C5471_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
@@ -1715,7 +1715,7 @@ static int c5471_txavail(struct net_driver_s *dev)
        {
           /* If so, then poll uIP for new XMIT data */
 
-          (void)devif_poll(&c5471->c_dev, c5471_uiptxpoll);
+          (void)devif_poll(&c5471->c_dev, c5471_txpoll);
        }
     }
 
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 52a6d65278..1cc7eac581 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -224,7 +224,7 @@ static inline uint16_t kinesis_swap16(uint16_t value);
 
 static bool kinetics_txringfull(FAR struct kinetis_driver_s *priv);
 static int  kinetis_transmit(FAR struct kinetis_driver_s *priv);
-static int  kinetis_uiptxpoll(struct net_driver_s *dev);
+static int  kinetis_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -411,7 +411,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: kinetis_uiptxpoll
+ * Function: kinetis_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -434,7 +434,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
  *
  ****************************************************************************/
 
-static int kinetis_uiptxpoll(struct net_driver_s *dev)
+static int kinetis_txpoll(struct net_driver_s *dev)
 {
   FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)dev->d_private;
 
@@ -609,7 +609,7 @@ static void kinetis_txdone(FAR struct kinetis_driver_s *priv)
    * data
    */
 
-  (void)devif_poll(&priv->dev, kinetis_uiptxpoll);
+  (void)devif_poll(&priv->dev, kinetis_txpoll);
 }
 
 /****************************************************************************
@@ -722,7 +722,7 @@ static void kinetis_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->dev, kinetis_uiptxpoll);
+  (void)devif_poll(&priv->dev, kinetis_txpoll);
 }
 
 /****************************************************************************
@@ -758,7 +758,7 @@ static void kinetis_polltimer(int argc, uint32_t arg, ...)
        * we will missing TCP time state updates?
        */
 
-      (void)devif_timer(&priv->dev, kinetis_uiptxpoll, KINETIS_POLLHSEC);
+      (void)devif_timer(&priv->dev, kinetis_txpoll, KINETIS_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again in any case */
@@ -973,7 +973,7 @@ static int kinetis_txavail(struct net_driver_s *dev)
             * XMIT data.
             */
 
-           (void)devif_poll(&priv->dev, kinetis_uiptxpoll);
+           (void)devif_poll(&priv->dev, kinetis_txpoll);
         }
     }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index f38e5c435d..e1522507c0 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -325,7 +325,7 @@ static void lpc17_putreg(uint32_t val, uint32_t addr);
 
 static int  lpc17_txdesc(struct lpc17_driver_s *priv);
 static int  lpc17_transmit(struct lpc17_driver_s *priv);
-static int  lpc17_uiptxpoll(struct net_driver_s *dev);
+static int  lpc17_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -643,7 +643,7 @@ static int lpc17_transmit(struct lpc17_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: lpc17_uiptxpoll
+ * Function: lpc17_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -666,7 +666,7 @@ static int lpc17_transmit(struct lpc17_driver_s *priv)
  *
  ****************************************************************************/
 
-static int lpc17_uiptxpoll(struct net_driver_s *dev)
+static int lpc17_txpoll(struct net_driver_s *dev)
 {
   struct lpc17_driver_s *priv = (struct lpc17_driver_s *)dev->d_private;
   int ret = OK;
@@ -977,7 +977,7 @@ static void lpc17_txdone(struct lpc17_driver_s *priv)
 
   else
     {
-      (void)devif_poll(&priv->lp_dev, lpc17_uiptxpoll);
+      (void)devif_poll(&priv->lp_dev, lpc17_txpoll);
     }
 }
 
@@ -1188,7 +1188,7 @@ static void lpc17_txtimeout(int argc, uint32_t arg, ...)
 
       /* Then poll uIP for new XMIT data */
 
-      (void)devif_poll(&priv->lp_dev, lpc17_uiptxpoll);
+      (void)devif_poll(&priv->lp_dev, lpc17_txpoll);
     }
 }
 
@@ -1225,7 +1225,7 @@ static void lpc17_polltimer(int argc, uint32_t arg, ...)
        * we will missing TCP time state updates?
        */
 
-      (void)devif_timer(&priv->lp_dev, lpc17_uiptxpoll, LPC17_POLLHSEC);
+      (void)devif_timer(&priv->lp_dev, lpc17_txpoll, LPC17_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
@@ -1482,7 +1482,7 @@ static int lpc17_txavail(struct net_driver_s *dev)
         {
           /* If so, then poll uIP for new XMIT data */
 
-          (void)devif_poll(&priv->lp_dev, lpc17_uiptxpoll);
+          (void)devif_poll(&priv->lp_dev, lpc17_txpoll);
         }
     }
 
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index 20be02abcc..64b3ad6af0 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -345,7 +345,7 @@ static void sam_buffer_free(struct sam_emac_s *priv);
 /* Common TX logic */
 
 static int  sam_transmit(struct sam_emac_s *priv);
-static int  sam_uiptxpoll(struct net_driver_s *dev);
+static int  sam_txpoll(struct net_driver_s *dev);
 static void sam_dopoll(struct sam_emac_s *priv);
 
 /* Interrupt handling */
@@ -785,7 +785,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 }
 
 /****************************************************************************
- * Function: sam_uiptxpoll
+ * Function: sam_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -808,7 +808,7 @@ static int sam_transmit(struct sam_emac_s *priv)
  *
  ****************************************************************************/
 
-static int sam_uiptxpoll(struct net_driver_s *dev)
+static int sam_txpoll(struct net_driver_s *dev)
 {
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
 
@@ -873,7 +873,7 @@ static void sam_dopoll(struct sam_emac_s *priv)
     {
       /* If we have the descriptor, then poll uIP for new XMIT data. */
 
-      (void)devif_poll(dev, sam_uiptxpoll);
+      (void)devif_poll(dev, sam_txpoll);
     }
 }
 
@@ -1517,7 +1517,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...)
     {
       /* Update TCP timing states and poll uIP for new XMIT data. */
 
-      (void)devif_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
+      (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index b20d916a0b..3d74cf59df 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -350,7 +350,7 @@ static void sam_buffer_free(struct sam_emac_s *priv);
 /* Common TX logic */
 
 static int  sam_transmit(struct sam_emac_s *priv);
-static int  sam_uiptxpoll(struct net_driver_s *dev);
+static int  sam_txpoll(struct net_driver_s *dev);
 static void sam_dopoll(struct sam_emac_s *priv);
 
 /* Interrupt handling */
@@ -795,7 +795,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 }
 
 /****************************************************************************
- * Function: sam_uiptxpoll
+ * Function: sam_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -818,7 +818,7 @@ static int sam_transmit(struct sam_emac_s *priv)
  *
  ****************************************************************************/
 
-static int sam_uiptxpoll(struct net_driver_s *dev)
+static int sam_txpoll(struct net_driver_s *dev)
 {
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
 
@@ -883,7 +883,7 @@ static void sam_dopoll(struct sam_emac_s *priv)
     {
       /* If we have the descriptor, then poll uIP for new XMIT data. */
 
-      (void)devif_poll(dev, sam_uiptxpoll);
+      (void)devif_poll(dev, sam_txpoll);
     }
 }
 
@@ -1558,7 +1558,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...)
     {
       /* Update TCP timing states and poll uIP for new XMIT data. */
 
-      (void)devif_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
+      (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index ef37fd387d..ce2a4f0adc 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -451,7 +451,7 @@ static void sam_buffer_free(struct sam_emac_s *priv);
 /* Common TX logic */
 
 static int  sam_transmit(struct sam_emac_s *priv);
-static int  sam_uiptxpoll(struct net_driver_s *dev);
+static int  sam_txpoll(struct net_driver_s *dev);
 static void sam_dopoll(struct sam_emac_s *priv);
 
 /* Interrupt handling */
@@ -1117,7 +1117,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 }
 
 /****************************************************************************
- * Function: sam_uiptxpoll
+ * Function: sam_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -1140,7 +1140,7 @@ static int sam_transmit(struct sam_emac_s *priv)
  *
  ****************************************************************************/
 
-static int sam_uiptxpoll(struct net_driver_s *dev)
+static int sam_txpoll(struct net_driver_s *dev)
 {
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
 
@@ -1205,7 +1205,7 @@ static void sam_dopoll(struct sam_emac_s *priv)
     {
       /* If we have the descriptor, then poll uIP for new XMIT data. */
 
-      (void)devif_poll(dev, sam_uiptxpoll);
+      (void)devif_poll(dev, sam_txpoll);
     }
 }
 
@@ -1910,7 +1910,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...)
     {
       /* Update TCP timing states and poll uIP for new XMIT data. */
 
-      (void)devif_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
+      (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index 15e4fa6e6a..2f8c9a3bf7 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -275,7 +275,7 @@ static void sam_buffer_free(struct sam_gmac_s *priv);
 /* Common TX logic */
 
 static int  sam_transmit(struct sam_gmac_s *priv);
-static int  sam_uiptxpoll(struct net_driver_s *dev);
+static int  sam_txpoll(struct net_driver_s *dev);
 static void sam_dopoll(struct sam_gmac_s *priv);
 
 /* Interrupt handling */
@@ -727,7 +727,7 @@ static int sam_transmit(struct sam_gmac_s *priv)
 }
 
 /****************************************************************************
- * Function: sam_uiptxpoll
+ * Function: sam_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -750,7 +750,7 @@ static int sam_transmit(struct sam_gmac_s *priv)
  *
  ****************************************************************************/
 
-static int sam_uiptxpoll(struct net_driver_s *dev)
+static int sam_txpoll(struct net_driver_s *dev)
 {
   struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
 
@@ -815,7 +815,7 @@ static void sam_dopoll(struct sam_gmac_s *priv)
     {
       /* If we have the descriptor, then poll uIP for new XMIT data. */
 
-      (void)devif_poll(dev, sam_uiptxpoll);
+      (void)devif_poll(dev, sam_txpoll);
     }
 }
 
@@ -1510,7 +1510,7 @@ static void sam_polltimer(int argc, uint32_t arg, ...)
     {
       /* Update TCP timing states and poll uIP for new XMIT data. */
 
-      (void)devif_timer(dev, sam_uiptxpoll, SAM_POLLHSEC);
+      (void)devif_timer(dev, sam_txpoll, SAM_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 5b786d87a6..0b3b3c2ab4 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -627,7 +627,7 @@ static inline bool stm32_isfreebuffer(FAR struct stm32_ethmac_s *priv);
 /* Common TX logic */
 
 static int  stm32_transmit(FAR struct stm32_ethmac_s *priv);
-static int  stm32_uiptxpoll(struct net_driver_s *dev);
+static int  stm32_txpoll(struct net_driver_s *dev);
 static void stm32_dopoll(FAR struct stm32_ethmac_s *priv);
 
 /* Interrupt handling */
@@ -1136,7 +1136,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
 }
 
 /****************************************************************************
- * Function: stm32_uiptxpoll
+ * Function: stm32_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -1159,7 +1159,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
  *
  ****************************************************************************/
 
-static int stm32_uiptxpoll(struct net_driver_s *dev)
+static int stm32_txpoll(struct net_driver_s *dev)
 {
   FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private;
 
@@ -1266,7 +1266,7 @@ static void stm32_dopoll(FAR struct stm32_ethmac_s *priv)
 
       if (dev->d_buf)
         {
-          (void)devif_poll(dev, stm32_uiptxpoll);
+          (void)devif_poll(dev, stm32_txpoll);
 
           /* We will, most likely end up with a buffer to be freed.  But it
            * might not be the same one that we allocated above.
@@ -1994,7 +1994,7 @@ static void stm32_polltimer(int argc, uint32_t arg, ...)
           /* Update TCP timing states and poll uIP for new XMIT data.
            */
 
-          (void)devif_timer(dev, stm32_uiptxpoll, STM32_POLLHSEC);
+          (void)devif_timer(dev, stm32_txpoll, STM32_POLLHSEC);
 
           /* We will, most likely end up with a buffer to be freed.  But it
            * might not be the same one that we allocated above.
diff --git a/arch/arm/src/tiva/tiva_ethernet.c b/arch/arm/src/tiva/tiva_ethernet.c
index a9154b89dc..4a988f1c21 100644
--- a/arch/arm/src/tiva/tiva_ethernet.c
+++ b/arch/arm/src/tiva/tiva_ethernet.c
@@ -238,7 +238,7 @@ static uint16_t tiva_phyread(struct tiva_driver_s *priv, int regaddr);
 /* Common TX logic */
 
 static int  tiva_transmit(struct tiva_driver_s *priv);
-static int  tiva_uiptxpoll(struct net_driver_s *dev);
+static int  tiva_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -573,7 +573,7 @@ static int tiva_transmit(struct tiva_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: tiva_uiptxpoll
+ * Function: tiva_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -593,7 +593,7 @@ static int tiva_transmit(struct tiva_driver_s *priv)
  *
  ****************************************************************************/
 
-static int tiva_uiptxpoll(struct net_driver_s *dev)
+static int tiva_txpoll(struct net_driver_s *dev)
 {
   struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private;
   int ret = OK;
@@ -839,7 +839,7 @@ static void tiva_txdone(struct tiva_driver_s *priv)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->ld_dev, tiva_uiptxpoll);
+  (void)devif_poll(&priv->ld_dev, tiva_txpoll);
 }
 
 /****************************************************************************
@@ -963,7 +963,7 @@ static void tiva_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->ld_dev, tiva_uiptxpoll);
+  (void)devif_poll(&priv->ld_dev, tiva_txpoll);
 }
 
 /****************************************************************************
@@ -999,7 +999,7 @@ static void tiva_polltimer(int argc, uint32_t arg, ...)
     {
       /* If so, update TCP timing states and poll uIP for new XMIT data */
 
-      (void)devif_timer(&priv->ld_dev, tiva_uiptxpoll, TIVA_POLLHSEC);
+      (void)devif_timer(&priv->ld_dev, tiva_txpoll, TIVA_POLLHSEC);
 
       /* Setup the watchdog poll timer again */
 
@@ -1285,7 +1285,7 @@ static int tiva_txavail(struct net_driver_s *dev)
        * for new Tx data
        */
 
-      (void)devif_poll(&priv->ld_dev, tiva_uiptxpoll);
+      (void)devif_poll(&priv->ld_dev, tiva_txpoll);
     }
 
   irqrestore(flags);
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index 27f1764924..d9461ed3a8 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -112,7 +112,7 @@ static struct emac_driver_s g_emac[CONFIG_HCS12_NINTERFACES];
 /* Common TX logic */
 
 static int  emac_transmit(FAR struct emac_driver_s *priv);
-static int  emac_uiptxpoll(struct net_driver_s *dev);
+static int  emac_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -179,7 +179,7 @@ static int emac_transmit(FAR struct emac_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: emac_uiptxpoll
+ * Function: emac_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -202,7 +202,7 @@ static int emac_transmit(FAR struct emac_driver_s *priv)
  *
  ****************************************************************************/
 
-static int emac_uiptxpoll(struct net_driver_s *dev)
+static int emac_txpoll(struct net_driver_s *dev)
 {
   FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
 
@@ -323,7 +323,7 @@ static void emac_txdone(FAR struct emac_driver_s *priv)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->d_dev, emac_uiptxpoll);
+  (void)devif_poll(&priv->d_dev, emac_txpoll);
 }
 
 /****************************************************************************
@@ -394,7 +394,7 @@ static void emac_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->d_dev, emac_uiptxpoll);
+  (void)devif_poll(&priv->d_dev, emac_txpoll);
 }
 
 /****************************************************************************
@@ -428,7 +428,7 @@ static void emac_polltimer(int argc, uint32_t arg, ...)
    * we will missing TCP time state updates?
    */
 
-  (void)devif_timer(&priv->d_dev, emac_uiptxpoll, HCS12_POLLHSEC);
+  (void)devif_timer(&priv->d_dev, emac_txpoll, HCS12_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -554,7 +554,7 @@ static int emac_txavail(struct net_driver_s *dev)
 
       /* If so, then poll uIP for new XMIT data */
 
-      (void)devif_poll(&priv->d_dev, emac_uiptxpoll);
+      (void)devif_poll(&priv->d_dev, emac_txpoll);
     }
 
   irqrestore(flags);
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index 8858a63a04..fb3d7b269c 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -410,7 +410,7 @@ static struct pic32mx_rxdesc_s *pic32mx_rxdesc(struct pic32mx_driver_s *priv);
 /* Common TX logic */
 
 static int  pic32mx_transmit(struct pic32mx_driver_s *priv);
-static int  pic32mx_uiptxpoll(struct net_driver_s *dev);
+static int  pic32mx_txpoll(struct net_driver_s *dev);
 static void pic32mx_poll(struct pic32mx_driver_s *priv);
 static void pic32mx_timerpoll(struct pic32mx_driver_s *priv);
 
@@ -1109,7 +1109,7 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: pic32mx_uiptxpoll
+ * Function: pic32mx_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -1132,7 +1132,7 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv)
  *
  ****************************************************************************/
 
-static int pic32mx_uiptxpoll(struct net_driver_s *dev)
+static int pic32mx_txpoll(struct net_driver_s *dev)
 {
   struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
   int ret = OK;
@@ -1212,7 +1212,7 @@ static void pic32mx_poll(struct pic32mx_driver_s *priv)
           /* And perform the poll */
 
           priv->pd_polling = true;
-          (void)devif_poll(&priv->pd_dev, pic32mx_uiptxpoll);
+          (void)devif_poll(&priv->pd_dev, pic32mx_txpoll);
 
           /* Free any buffer left attached after the poll */
 
@@ -1258,7 +1258,7 @@ static void pic32mx_timerpoll(struct pic32mx_driver_s *priv)
           /* And perform the poll */
 
           priv->pd_polling = true;
-          (void)devif_timer(&priv->pd_dev, pic32mx_uiptxpoll, PIC32MX_POLLHSEC);
+          (void)devif_timer(&priv->pd_dev, pic32mx_txpoll, PIC32MX_POLLHSEC);
 
           /* Free any buffer left attached after the poll */
 
diff --git a/arch/sim/src/up_uipdriver.c b/arch/sim/src/up_uipdriver.c
index 7bf11244aa..5c8d21f2c5 100644
--- a/arch/sim/src/up_uipdriver.c
+++ b/arch/sim/src/up_uipdriver.c
@@ -115,7 +115,7 @@ static inline int up_comparemac(uint8_t *paddr1, struct ether_addr *paddr2)
 }
 #endif
 
-static int sim_uiptxpoll(struct net_driver_s *dev)
+static int sim_txpoll(struct net_driver_s *dev)
 {
   /* If the polling resulted in data that should be sent out on the network,
    * the field d_len is set to a value > 0.
@@ -202,7 +202,7 @@ void uipdriver_loop(void)
   else if (timer_expired(&g_periodic_timer))
     {
       timer_reset(&g_periodic_timer);
-      devif_timer(&g_sim_dev, sim_uiptxpoll, 1);
+      devif_timer(&g_sim_dev, sim_txpoll, 1);
     }
   sched_unlock();
 }
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index 26c9f41939..ab9e08a1aa 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -355,7 +355,7 @@ static void ez80emac_machash(FAR uint8_t *mac, int *ndx, int *bitno)
 /* TX/RX logic */
 
 static int  ez80emac_transmit(struct ez80emac_driver_s *priv);
-static int  ez80emac_uiptxpoll(struct net_driver_s *dev);
+static int  ez80emac_txpoll(struct net_driver_s *dev);
 
 static inline FAR struct ez80emac_desc_s *ez80emac_rwp(void);
 static inline FAR struct ez80emac_desc_s *ez80emac_rrp(void);
@@ -1044,7 +1044,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: ez80emac_uiptxpoll
+ * Function: ez80emac_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -1064,7 +1064,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv)
  *
  ****************************************************************************/
 
-static int ez80emac_uiptxpoll(struct net_driver_s *dev)
+static int ez80emac_txpoll(struct net_driver_s *dev)
 {
   struct ez80emac_driver_s *priv = (struct ez80emac_driver_s *)dev->d_private;
   int ret = 0;
@@ -1578,7 +1578,7 @@ static void ez80emac_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->dev, ez80emac_uiptxpoll);
+  (void)devif_poll(&priv->dev, ez80emac_txpoll);
 }
 
 /****************************************************************************
@@ -1604,7 +1604,7 @@ static void ez80emac_polltimer(int argc, uint32_t arg, ...)
 
   /* Poll uIP for new XMIT data */
 
-  (void)devif_timer(&priv->dev, ez80emac_uiptxpoll, EMAC_POLLHSEC);
+  (void)devif_timer(&priv->dev, ez80emac_txpoll, EMAC_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -1791,7 +1791,7 @@ static int ez80emac_txavail(struct net_driver_s *dev)
 
       /* If so, then poll uIP for new XMIT data */
 
-      (void)devif_poll(&priv->dev, ez80emac_uiptxpoll);
+      (void)devif_poll(&priv->dev, ez80emac_txpoll);
     }
 
   irqrestore(flags);
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 9bb17ac4c6..89ac472103 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -116,7 +116,7 @@ static void cs89x0_putppreg(struct cs89x0_driver_s *cs89x0, int addr,
 /* Common TX logic */
 
 static int  cs89x0_transmit(struct cs89x0_driver_s *cs89x0);
-static int  cs89x0_uiptxpoll(struct net_driver_s *dev);
+static int  cs89x0_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -307,7 +307,7 @@ static int cs89x0_transmit(struct cs89x0_driver_s *cs89x0)
 }
 
 /****************************************************************************
- * Function: cs89x0_uiptxpoll
+ * Function: cs89x0_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -327,7 +327,7 @@ static int cs89x0_transmit(struct cs89x0_driver_s *cs89x0)
  *
  ****************************************************************************/
 
-static int cs89x0_uiptxpoll(struct net_driver_s *dev)
+static int cs89x0_txpoll(struct net_driver_s *dev)
 {
   struct cs89x0_driver_s *cs89x0 = (struct cs89x0_driver_s *)dev->d_private;
 
@@ -518,7 +518,7 @@ static void cs89x0_txdone(struct cs89x0_driver_s *cs89x0, uint16_t isq)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
+  (void)devif_poll(&cs89x0->cs_dev, cs89x0_txpoll);
 }
 
 /****************************************************************************
@@ -663,7 +663,7 @@ static void cs89x0_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
+  (void)devif_poll(&cs89x0->cs_dev, cs89x0_txpoll);
 }
 
 /****************************************************************************
@@ -692,7 +692,7 @@ static void cs89x0_polltimer(int argc, uint32_t arg, ...)
 
   /* If so, update TCP timing states and poll uIP for new XMIT data */
 
-  (void)devif_timer(&cs89x0->cs_dev, cs89x0_uiptxpoll, CS89x0_POLLHSEC);
+  (void)devif_timer(&cs89x0->cs_dev, cs89x0_txpoll, CS89x0_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -811,7 +811,7 @@ static int cs89x0_txavail(struct net_driver_s *dev)
 
       /* If so, then poll uIP for new XMIT data */
 
-      (void)devif_poll(&cs89x0->cs_dev, cs89x0_uiptxpoll);
+      (void)devif_poll(&cs89x0->cs_dev, cs89x0_txpoll);
     }
 
   irqrestore(flags);
diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c
index 6127defa79..f3c4090a1c 100644
--- a/drivers/net/dm90x0.c
+++ b/drivers/net/dm90x0.c
@@ -376,7 +376,7 @@ static bool dm9x_rxchecksumready(uint8_t);
 /* Common TX logic */
 
 static int  dm9x_transmit(struct dm9x_driver_s *dm9x);
-static int  dm9x_uiptxpoll(struct net_driver_s *dev);
+static int  dm9x_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -819,7 +819,7 @@ static int dm9x_transmit(struct dm9x_driver_s *dm9x)
 }
 
 /****************************************************************************
- * Function: dm9x_uiptxpoll
+ * Function: dm9x_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -839,7 +839,7 @@ static int dm9x_transmit(struct dm9x_driver_s *dm9x)
  *
  ****************************************************************************/
 
-static int dm9x_uiptxpoll(struct net_driver_s *dev)
+static int dm9x_txpoll(struct net_driver_s *dev)
 {
   struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
 
@@ -1086,7 +1086,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
+  (void)devif_poll(&dm9x->dm_dev, dm9x_txpoll);
 }
 
 /****************************************************************************
@@ -1249,7 +1249,7 @@ static void dm9x_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
+  (void)devif_poll(&dm9x->dm_dev, dm9x_txpoll);
 }
 
 /****************************************************************************
@@ -1291,7 +1291,7 @@ static void dm9x_polltimer(int argc, uint32_t arg, ...)
     {
       /* If so, update TCP timing states and poll uIP for new XMIT data */
 
-      (void)devif_timer(&dm9x->dm_dev, dm9x_uiptxpoll, DM6X_POLLHSEC);
+      (void)devif_timer(&dm9x->dm_dev, dm9x_txpoll, DM6X_POLLHSEC);
     }
 
   /* Setup the watchdog poll timer again */
@@ -1499,7 +1499,7 @@ static int dm9x_txavail(struct net_driver_s *dev)
         {
           /* If so, then poll uIP for new XMIT data */
 
-          (void)devif_poll(&dm9x->dm_dev, dm9x_uiptxpoll);
+          (void)devif_poll(&dm9x->dm_dev, dm9x_txpoll);
         }
     }
   irqrestore(flags);
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index b800ca9492..ce3fe13ce0 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -146,7 +146,7 @@ static struct e1000_dev_head e1000_list = {0};
 /* Common TX logic */
 
 static int  e1000_transmit(struct e1000_dev *e1000);
-static int  e1000_uiptxpoll(struct net_driver_s *dev);
+static int  e1000_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -453,7 +453,7 @@ static int e1000_transmit(struct e1000_dev *e1000)
 }
 
 /****************************************************************************
- * Function: e1000_uiptxpoll
+ * Function: e1000_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -476,7 +476,7 @@ static int e1000_transmit(struct e1000_dev *e1000)
  *
  ****************************************************************************/
 
-static int e1000_uiptxpoll(struct net_driver_s *dev)
+static int e1000_txpoll(struct net_driver_s *dev)
 {
   struct e1000_dev *e1000 = (struct e1000_dev *)dev->d_private;
   int tail = e1000->tx_ring.tail;
@@ -641,7 +641,7 @@ static void e1000_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&e1000->netdev, e1000_uiptxpoll);
+  (void)devif_poll(&e1000->netdev, e1000_txpoll);
 }
 
 /****************************************************************************
@@ -681,7 +681,7 @@ static void e1000_polltimer(int argc, uint32_t arg, ...)
    * we will missing TCP time state updates?
    */
 
-  (void)devif_timer(&e1000->netdev, e1000_uiptxpoll, E1000_POLLHSEC);
+  (void)devif_timer(&e1000->netdev, e1000_txpoll, E1000_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -819,7 +819,7 @@ static int e1000_txavail(struct net_driver_s *dev)
 
       if (e1000->tx_ring.desc[tail].desc_status)
         {
-          (void)devif_poll(&e1000->netdev, e1000_uiptxpoll);
+          (void)devif_poll(&e1000->netdev, e1000_txpoll);
         }
     }
 
@@ -938,7 +938,7 @@ static irqreturn_t e1000_interrupt_handler(int irq, void *dev_id)
 
   if (intr_cause & (1<<0))
     {
-      devif_poll(&e1000->netdev, e1000_uiptxpoll);
+      devif_poll(&e1000->netdev, e1000_txpoll);
     }
 
 
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 67cae3af25..25a0272e84 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -312,7 +312,7 @@ static void enc_wrphy(FAR struct enc_driver_s *priv, uint8_t phyaddr,
 /* Common TX logic */
 
 static int  enc_transmit(FAR struct enc_driver_s *priv);
-static int  enc_uiptxpoll(struct net_driver_s *dev);
+static int  enc_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -1163,7 +1163,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: enc_uiptxpoll
+ * Function: enc_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -1184,7 +1184,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
  *
  ****************************************************************************/
 
-static int enc_uiptxpoll(struct net_driver_s *dev)
+static int enc_txpoll(struct net_driver_s *dev)
 {
   FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
 
@@ -1276,7 +1276,7 @@ static void enc_txif(FAR struct enc_driver_s *priv)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->dev, enc_uiptxpoll);
+  (void)devif_poll(&priv->dev, enc_txpoll);
 }
 
 /****************************************************************************
@@ -1835,7 +1835,7 @@ static void enc_toworker(FAR void *arg)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->dev, enc_uiptxpoll);
+  (void)devif_poll(&priv->dev, enc_txpoll);
 
   /* Release lock on uIP */
 
@@ -1924,7 +1924,7 @@ static void enc_pollworker(FAR void *arg)
        * in progress, we will missing TCP time state updates?
        */
 
-      (void)devif_timer(&priv->dev, enc_uiptxpoll, ENC_POLLHSEC);
+      (void)devif_timer(&priv->dev, enc_txpoll, ENC_POLLHSEC);
     }
 
   /* Release lock on the SPI bus and uIP */
@@ -2144,7 +2144,7 @@ static int enc_txavail(struct net_driver_s *dev)
         {
           /* The interface is up and TX is idle; poll uIP for new XMIT data */
 
-          (void)devif_poll(&priv->dev, enc_uiptxpoll);
+          (void)devif_poll(&priv->dev, enc_txpoll);
         }
     }
 
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index 2665f96943..c3feb49188 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -328,7 +328,7 @@ static void enc_wrphy(FAR struct enc_driver_s *priv, uint8_t phyaddr,
 
 static int  enc_txenqueue(FAR struct enc_driver_s *priv);
 static int  enc_transmit(FAR struct enc_driver_s *priv);
-static int  enc_uiptxpoll(struct net_driver_s *dev);
+static int  enc_txpoll(struct net_driver_s *dev);
 
 /* Common RX logic */
 
@@ -1175,7 +1175,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: enc_uiptxpoll
+ * Function: enc_txpoll
  *
  * Description:
  *   Enqueues uIP packets if available.
@@ -1196,7 +1196,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv)
  *
  ****************************************************************************/
 
-static int enc_uiptxpoll(struct net_driver_s *dev)
+static int enc_txpoll(struct net_driver_s *dev)
 {
   FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
   int ret = OK;
@@ -1305,7 +1305,7 @@ static void enc_txif(FAR struct enc_driver_s *priv)
 
       /* Poll for uip packets */
 
-      devif_poll(&priv->dev, enc_uiptxpoll);
+      devif_poll(&priv->dev, enc_txpoll);
     }
   else
     {
@@ -2005,7 +2005,7 @@ static void enc_toworker(FAR void *arg)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&priv->dev, enc_uiptxpoll);
+  (void)devif_poll(&priv->dev, enc_txpoll);
 
   /* Release uIP */
 
@@ -2095,7 +2095,7 @@ static void enc_pollworker(FAR void *arg)
        * in progress, we will missing TCP time state updates?
        */
 
-      (void)devif_timer(&priv->dev, enc_uiptxpoll, ENC_POLLHSEC);
+      (void)devif_timer(&priv->dev, enc_txpoll, ENC_POLLHSEC);
     }
 
   /* Release lock on the SPI bus and uIP */
@@ -2321,7 +2321,7 @@ static int enc_txavail(struct net_driver_s *dev)
         {
           /* The interface is up and TX is idle; poll uIP for new XMIT data */
 
-          (void)devif_poll(&priv->dev, enc_uiptxpoll);
+          (void)devif_poll(&priv->dev, enc_txpoll);
         }
     }
 
diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c
index a7ce5c68b9..63ff38d6de 100644
--- a/drivers/net/skeleton.c
+++ b/drivers/net/skeleton.c
@@ -112,7 +112,7 @@ static struct skel_driver_s g_skel[CONFIG_skeleton_NINTERFACES];
 /* Common TX logic */
 
 static int  skel_transmit(FAR struct skel_driver_s *skel);
-static int  skel_uiptxpoll(struct net_driver_s *dev);
+static int  skel_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -179,7 +179,7 @@ static int skel_transmit(FAR struct skel_driver_s *skel)
 }
 
 /****************************************************************************
- * Function: skel_uiptxpoll
+ * Function: skel_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -202,7 +202,7 @@ static int skel_transmit(FAR struct skel_driver_s *skel)
  *
  ****************************************************************************/
 
-static int skel_uiptxpoll(struct net_driver_s *dev)
+static int skel_txpoll(struct net_driver_s *dev)
 {
   FAR struct skel_driver_s *skel = (FAR struct skel_driver_s *)dev->d_private;
 
@@ -323,7 +323,7 @@ static void skel_txdone(FAR struct skel_driver_s *skel)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&skel->sk_dev, skel_uiptxpoll);
+  (void)devif_poll(&skel->sk_dev, skel_txpoll);
 }
 
 /****************************************************************************
@@ -394,7 +394,7 @@ static void skel_txtimeout(int argc, uint32_t arg, ...)
 
   /* Then poll uIP for new XMIT data */
 
-  (void)devif_poll(&skel->sk_dev, skel_uiptxpoll);
+  (void)devif_poll(&skel->sk_dev, skel_txpoll);
 }
 
 /****************************************************************************
@@ -428,7 +428,7 @@ static void skel_polltimer(int argc, uint32_t arg, ...)
    * we will missing TCP time state updates?
    */
 
-  (void)devif_timer(&skel->sk_dev, skel_uiptxpoll, skeleton_POLLHSEC);
+  (void)devif_timer(&skel->sk_dev, skel_txpoll, skeleton_POLLHSEC);
 
   /* Setup the watchdog poll timer again */
 
@@ -554,7 +554,7 @@ static int skel_txavail(struct net_driver_s *dev)
 
       /* If so, then poll uIP for new XMIT data */
 
-      (void)devif_poll(&skel->sk_dev, skel_uiptxpoll);
+      (void)devif_poll(&skel->sk_dev, skel_txpoll);
     }
 
   irqrestore(flags);
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index a13233185a..56a61d5317 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -202,7 +202,7 @@ static void slip_semtake(FAR struct slip_driver_s *priv);
 static void slip_write(FAR struct slip_driver_s *priv, const uint8_t *buffer, int len);
 static void slip_putc(FAR struct slip_driver_s *priv, int ch);
 static int slip_transmit(FAR struct slip_driver_s *priv);
-static int slip_uiptxpoll(struct net_driver_s *dev);
+static int slip_txpoll(struct net_driver_s *dev);
 static void slip_txtask(int argc, char *argv[]);
 
 /* Packet receiver task */
@@ -398,7 +398,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: slip_uiptxpoll
+ * Function: slip_txpoll
  *
  * Description:
  *   Check if uIP has any outgoing packets ready to send.  This is a
@@ -419,7 +419,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv)
  *
  ****************************************************************************/
 
-static int slip_uiptxpoll(struct net_driver_s *dev)
+static int slip_txpoll(struct net_driver_s *dev)
 {
   FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
 
@@ -495,7 +495,7 @@ static void slip_txtask(int argc, char *argv[])
 
           flags = net_lock();
           priv->dev.d_buf = priv->txbuf;
-          (void)devif_timer(&priv->dev, slip_uiptxpoll, SLIP_POLLHSEC);
+          (void)devif_timer(&priv->dev, slip_txpoll, SLIP_POLLHSEC);
           net_unlock(flags);
           slip_semgive(priv);
         }
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index d3db255e3c..8817f6b90d 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -119,7 +119,7 @@ static struct vnet_driver_s g_vnet[CONFIG_VNET_NINTERFACES];
 /* Common TX logic */
 
 static int  vnet_transmit(FAR struct vnet_driver_s *vnet);
-static int  vnet_uiptxpoll(struct net_driver_s *dev);
+static int  vnet_txpoll(struct net_driver_s *dev);
 
 /* Interrupt handling */
 
@@ -198,7 +198,7 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet)
 }
 
 /****************************************************************************
- * Function: vnet_uiptxpoll
+ * Function: vnet_txpoll
  *
  * Description:
  *   The transmitter is available, check if uIP has any outgoing packets ready
@@ -221,7 +221,7 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet)
  *
  ****************************************************************************/
 
-static int vnet_uiptxpoll(struct net_driver_s *dev)
+static int vnet_txpoll(struct net_driver_s *dev)
 {
 	FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;
 
@@ -345,7 +345,7 @@ static void vnet_txdone(FAR struct vnet_driver_s *vnet)
 
 	/* Then poll uIP for new XMIT data */
 
-	(void)devif_poll(&vnet->sk_dev, vnet_uiptxpoll);
+	(void)devif_poll(&vnet->sk_dev, vnet_txpoll);
 }
 
 /****************************************************************************
@@ -377,7 +377,7 @@ static void vnet_txtimeout(int argc, uint32_t arg, ...)
 
 	/* Then poll uIP for new XMIT data */
 
-	(void)devif_poll(&vnet->sk_dev, vnet_uiptxpoll);
+	(void)devif_poll(&vnet->sk_dev, vnet_txpoll);
 }
 
 /****************************************************************************
@@ -417,7 +417,7 @@ static void vnet_polltimer(int argc, uint32_t arg, ...)
 	 * we will missing TCP time state updates?
 	 */
 
-	(void)devif_timer(&vnet->sk_dev, vnet_uiptxpoll, VNET_POLLHSEC);
+	(void)devif_timer(&vnet->sk_dev, vnet_txpoll, VNET_POLLHSEC);
 
 	/* Setup the watchdog poll timer again */
 
@@ -545,7 +545,7 @@ static int vnet_txavail(struct net_driver_s *dev)
 
 		/* If so, then poll uIP for new XMIT data */
 
-		(void)devif_poll(&vnet->sk_dev, vnet_uiptxpoll);
+		(void)devif_poll(&vnet->sk_dev, vnet_txpoll);
     }
 
 out: