summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-06-30 18:15:59 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-06-30 18:15:59 -0600
commit8299f4051ce03e4c56c08c93a81af0c36e24a2f0 (patch)
tree6f9e76e5f1a9d6fedd60e7d9a6b16728a22ebcde
parentc10a6f9414be8cf967d5486608779c28eecc27f8 (diff)
downloadnuttx-8299f4051ce03e4c56c08c93a81af0c36e24a2f0.tar.gz
nuttx-8299f4051ce03e4c56c08c93a81af0c36e24a2f0.tar.bz2
nuttx-8299f4051ce03e4c56c08c93a81af0c36e24a2f0.zip
NET: Rename uip_ping to icmp_ping
-rw-r--r--apps/nshlib/nsh_netcmds.c2
-rw-r--r--nuttx/TODO2
-rw-r--r--nuttx/include/nuttx/net/icmp.h4
-rw-r--r--nuttx/net/icmp/icmp_ping.c6
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c
index 83bd56c76..53efb26e4 100644
--- a/apps/nshlib/nsh_netcmds.c
+++ b/apps/nshlib/nsh_netcmds.c
@@ -952,7 +952,7 @@ int cmd_ping(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
/* Send the ECHO request and wait for the response */
next = clock_systimer();
- seqno = uip_ping(ipaddr, id, i, DEFAULT_PING_DATALEN, maxwait);
+ seqno = icmp_ping(ipaddr, id, i, DEFAULT_PING_DATALEN, maxwait);
/* Was any response returned? We can tell if a non-negative sequence
* number was returned.
diff --git a/nuttx/TODO b/nuttx/TODO
index 6523d3f90..a36ac17f3 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -385,7 +385,7 @@ o Kernel Build
ifup netdev_foreach()
ifdown netdev_foreach()
ifconfig netdev_foreach(), g_netstats
- ping uip_ping()
+ ping icmp_ping()
Status: Open
Priority: Medium/High -- the kernel build configuration is not fully fielded
diff --git a/nuttx/include/nuttx/net/icmp.h b/nuttx/include/nuttx/net/icmp.h
index 3e1ea5605..a7dfe7b42 100644
--- a/nuttx/include/nuttx/net/icmp.h
+++ b/nuttx/include/nuttx/net/icmp.h
@@ -203,8 +203,8 @@ extern "C"
* Public Function Prototypes
****************************************************************************/
-int uip_ping(net_ipaddr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
- int dsecs);
+int icmp_ping(net_ipaddr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
+ int dsecs);
#undef EXTERN
#ifdef __cplusplus
diff --git a/nuttx/net/icmp/icmp_ping.c b/nuttx/net/icmp/icmp_ping.c
index 251041084..5271f179c 100644
--- a/nuttx/net/icmp/icmp_ping.c
+++ b/nuttx/net/icmp/icmp_ping.c
@@ -297,7 +297,7 @@ end_wait:
****************************************************************************/
/****************************************************************************
- * Name: uip_ping
+ * Name: imcp_ping
*
* Description:
* Send a ECHO request and wait for the ECHO response
@@ -323,8 +323,8 @@ end_wait:
*
****************************************************************************/
-int uip_ping(net_ipaddr_t addr, uint16_t id, uint16_t seqno,
- uint16_t datalen, int dsecs)
+int icmp_ping(net_ipaddr_t addr, uint16_t id, uint16_t seqno,
+ uint16_t datalen, int dsecs)
{
struct icmp_ping_s state;
net_lock_t save;