diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-25 09:12:47 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-25 09:12:47 -0600 |
| commit | 06868e7c06d42f4c9043b624bdcf56f6d1348d8a (patch) | |
| tree | 1d8954a18ab8d7c24c9efd69b546e2b3013ccc74 /nuttx/net/icmp/icmp_send.c | |
| parent | bba42d1e2d6fd42dc19c88cd1d6de064cf5f4049 (diff) | |
| download | px4-nuttx-06868e7c06d42f4c9043b624bdcf56f6d1348d8a.tar.gz px4-nuttx-06868e7c06d42f4c9043b624bdcf56f6d1348d8a.tar.bz2 px4-nuttx-06868e7c06d42f4c9043b624bdcf56f6d1348d8a.zip | |
Clean up ICMP naming
Diffstat (limited to 'nuttx/net/icmp/icmp_send.c')
| -rw-r--r-- | nuttx/net/icmp/icmp_send.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c index 96df208ea..0f72b3b3e 100644 --- a/nuttx/net/icmp/icmp_send.c +++ b/nuttx/net/icmp/icmp_send.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/icmp/icmp_send.c * - * Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -47,12 +47,13 @@ #include <nuttx/net/netdev.h> #include "uip/uip.h" +#include "icmp/icmp.h" /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ -#define ICMPBUF ((struct uip_icmpip_hdr *)&dev->d_buf[UIP_LLH_LEN]) +#define ICMPBUF ((struct icmp_iphdr_s *)&dev->d_buf[UIP_LLH_LEN]) /**************************************************************************** * Public Variables @@ -71,7 +72,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: uip_icmpsend + * Name: icmp_send * * Description: * Setup to send an ICMP packet @@ -87,9 +88,9 @@ * ****************************************************************************/ -void uip_icmpsend(struct uip_driver_s *dev, uip_ipaddr_t *destaddr) +void icmp_send(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *destaddr) { - struct uip_icmpip_hdr *picmp = ICMPBUF; + FAR struct icmp_iphdr_s *picmp = ICMPBUF; if (dev->d_sndlen > 0) { @@ -149,7 +150,7 @@ void uip_icmpsend(struct uip_driver_s *dev, uip_ipaddr_t *destaddr) /* Calculate the ICMP checksum. */ picmp->icmpchksum = 0; - picmp->icmpchksum = ~(uip_icmpchksum(dev, dev->d_sndlen)); + picmp->icmpchksum = ~(icmp_chksum(dev, dev->d_sndlen)); if (picmp->icmpchksum == 0) { picmp->icmpchksum = 0xffff; |