From 9711f6c66830fcfb56c47693d57bf175907cfb8b Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Fri, 9 Nov 2018 13:59:45 -0600
Subject: [PATCH] Remove dup definition in nuttx/net/arp.h and
 include/nuttx/net/ioctl.h

---
 include/netinet/arp.h     |  1 +
 include/nuttx/net/arp.h   | 21 +--------------------
 include/nuttx/net/ioctl.h |  8 --------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/include/netinet/arp.h b/include/netinet/arp.h
index 1ed14a6a67..dcaf530ea5 100644
--- a/include/netinet/arp.h
+++ b/include/netinet/arp.h
@@ -43,6 +43,7 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <net/if.h>
 #include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
diff --git a/include/nuttx/net/arp.h b/include/nuttx/net/arp.h
index cb935b500e..e6280317f5 100644
--- a/include/nuttx/net/arp.h
+++ b/include/nuttx/net/arp.h
@@ -53,6 +53,7 @@
 #include <stdint.h>
 
 #include <netinet/in.h>
+#include <netinet/arp.h>
 #include <net/ethernet.h>
 
 #include <nuttx/net/netconfig.h>
@@ -86,26 +87,6 @@ struct arp_entry_s
   clock_t           at_time;     /* Time of last usage */
 };
 
-/* Used with the SIOCSARP, SIOCDARP, and SIOCGARP IOCTL commands to set,
- * delete, or get an ARP table entry.
- *
- * SIOCSARP - Both values are inputs a define the new ARP table entry
- * SIOCDARP - Only the protcol address is required as an input.  The ARP
- *            table entry with that matching address will be deleted,
- *            regardless of the hardware address.
- * SIOCGARP - The protocol address is an input an identifies the table
- *            entry to locate; The hardware address is an output and
- *            on a successful lookup, provides the matching hardware
- *            address.
- */
-
-struct arpreq
-{
-  struct sockaddr   arp_pa;      /* Protocol address */
-  struct sockaddr   arp_ha;      /* Hardware address */
-};
-
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
diff --git a/include/nuttx/net/ioctl.h b/include/nuttx/net/ioctl.h
index c94c02d156..4717542e12 100644
--- a/include/nuttx/net/ioctl.h
+++ b/include/nuttx/net/ioctl.h
@@ -93,14 +93,6 @@
 #define SIOCGIPMSFILTER  _SIOC(0x001c)  /* Retrieve source filter addresses */
 #define SIOCSIPMSFILTER  _SIOC(0x001d)  /* Set source filter content */
 
-/* ARP Table.  Argument is a reference to sruct arpreq as defined
- * include/nuttx/net/arp.h
- */
-
-#define SIOCSARP         _SIOC(0x001e)  /* Set an ARP mapping */
-#define SIOCDARP         _SIOC(0x001f)  /* Delete an ARP mapping */
-#define SIOCGARP         _SIOC(0x0020)  /* Get an ARP mapping */
-
 /* Routing table.  Argument is a reference to struct rtentry as defined in
  * include/net/route.h
  */