net/arp: Remove nuttx/net/arp.h

1.move ARPHRD_ETHER to netinet/arp.h
1.move arp_entry_s to net/arp/arp.h
2.move arp_input to nuttx/net/netdev.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

arch/arm/src/c5471/c5471_ethernet.c

@@ -41,7 +41,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/arm/src/gd32f4/gd32f4xx_enet.c

@@ -47,7 +47,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/net/phy.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #if defined(CONFIG_NET_PKT)

arch/arm/src/imx6/imx_enet.c

@@ -44,7 +44,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/phy.h>
 #include <nuttx/net/netdev.h>
 

arch/arm/src/imxrt/imxrt_enet.c

@@ -44,7 +44,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/phy.h>
 #include <nuttx/net/netdev.h>
 

arch/arm/src/kinetis/kinetis_enet.c

@@ -43,7 +43,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c

@@ -44,7 +44,6 @@
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/arm/src/lpc43xx/lpc43_ethernet.c

@@ -42,7 +42,6 @@
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #if defined(CONFIG_NET_PKT)
 #  include <nuttx/net/pkt.h>

arch/arm/src/lpc54xx/lpc54_ethernet.c

@@ -80,7 +80,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/arm/src/rtl8720c/amebaz_driver.c

@@ -24,8 +24,9 @@
 
 #include <nuttx/config.h>
 #include <stdio.h>
+#include <netinet/arp.h>
 #include <nuttx/kmalloc.h>
-#include <nuttx/net/arp.h>
+
 #include "amebaz_netdev.h"
 
 /****************************************************************************

arch/arm/src/rtl8720c/amebaz_netdev.c

@@ -26,8 +26,8 @@
 #include <string.h>
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/kmalloc.h>
+
 #include "amebaz_netdev.h"
 
 /****************************************************************************

arch/arm/src/s32k1xx/s32k1xx_enet.c

@@ -43,7 +43,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/phy.h>
 #include <nuttx/net/netdev.h>
 

arch/arm/src/s32k3xx/s32k3xx_emac.c

@@ -44,7 +44,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/phy.h>
 #include <nuttx/net/netdev.h>
 

arch/arm/src/sam34/sam_emac.c

@@ -41,7 +41,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/phy.h>
 

arch/arm/src/sama5/sam_emaca.c

@@ -69,7 +69,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/phy.h>
 

arch/arm/src/sama5/sam_emacb.c

@@ -55,7 +55,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/phy.h>
 

arch/arm/src/sama5/sam_gmac.c

@@ -66,7 +66,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/gmii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/phy.h>
 

arch/arm/src/samd5e5/sam_gmac.c

@@ -65,7 +65,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/gmii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/phy.h>
 

arch/arm/src/samv7/sam_emac.c

@@ -48,7 +48,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/phy.h>
 

arch/arm/src/stm32/stm32_eth.c

@@ -44,7 +44,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/net/phy.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #if defined(CONFIG_NET_PKT)

arch/arm/src/stm32f7/stm32_ethernet.c

@@ -42,7 +42,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/crc64.h>
 

arch/arm/src/stm32h7/stm32_ethernet.c

@@ -42,7 +42,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/crc64.h>
 

arch/arm/src/tiva/lm/lm3s_ethernet.c

@@ -42,7 +42,6 @@
 #include <nuttx/wqueue.h>
 
 #include <arch/board/board.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/arm/src/tiva/tm4c/tm4c_ethernet.c

@@ -42,7 +42,6 @@
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_TIVA_PHY_INTERRUPTS

arch/hc/src/m9s12/m9s12_ethernet.c

@@ -38,7 +38,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/wdog.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/mips/src/pic32mx/pic32mx_ethernet.c

@@ -42,7 +42,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/mips/src/pic32mz/pic32mz_ethernet.c

@@ -41,7 +41,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/misoc/src/common/misoc_net.c

@@ -39,7 +39,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #include <arch/board/board.h>

arch/renesas/src/rx65n/rx65n_eth.c

@@ -43,7 +43,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/net/phy.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #if defined(CONFIG_ARCH_PHY_INTERRUPT)

arch/risc-v/src/bl602/bl602_netdev.c

@@ -46,7 +46,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/wireless/wireless.h>

arch/risc-v/src/esp32c3/esp32c3_wifi_utils.c

@@ -26,9 +26,9 @@
 
 #include <assert.h>
 #include <debug.h>
+#include <netinet/arp.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/wireless/wireless.h>
 
 #include "esp32c3_wifi_adapter.h"

arch/risc-v/src/esp32c3/esp32c3_wlan.c

@@ -38,7 +38,6 @@
 #include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #if defined(CONFIG_NET_PKT)
 #  include <nuttx/net/pkt.h>

arch/risc-v/src/litex/litex_emac.c

@@ -39,7 +39,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/ioctl.h>
 

arch/risc-v/src/mpfs/mpfs_ethernet.c

@@ -43,7 +43,6 @@
 #include <nuttx/signal.h>
 #include <nuttx/net/mii.h>
 #include <nuttx/net/gmii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/sim/src/sim/sim_netdriver.c

@@ -67,7 +67,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/pkt.h>
 
 #include "sim_internal.h"

arch/xtensa/src/esp32/esp32_emac.c

@@ -48,7 +48,6 @@
 #include <nuttx/net/ioctl.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

arch/xtensa/src/esp32/esp32_wifi_utils.c

@@ -26,9 +26,9 @@
 
 #include <assert.h>
 #include <debug.h>
+#include <netinet/arp.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/wireless/wireless.h>
 
 #include "esp32_wifi_adapter.h"

arch/xtensa/src/esp32/esp32_wlan.c

@@ -39,7 +39,6 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #if defined(CONFIG_NET_PKT)
 #  include <nuttx/net/pkt.h>

arch/z80/src/ez80/ez80_emac.c

@@ -46,7 +46,6 @@
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

drivers/net/dm90x0.c

@@ -52,7 +52,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

drivers/net/enc28j60.c

@@ -50,7 +50,6 @@
 #include <nuttx/clock.h>
 #include <nuttx/net/enc28j60.h>
 #include <nuttx/net/net.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

drivers/net/encx24j600.c

@@ -50,7 +50,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
 #include <nuttx/net/net.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/encx24j600.h>
 

drivers/net/ftmac100.c

@@ -42,7 +42,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/ftmac100.h>
 

drivers/net/lan91c111.c

@@ -33,7 +33,6 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
 
-#include <nuttx/net/arp.h>
 #include <nuttx/net/lan91c111.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/pkt.h>

drivers/net/rpmsgdrv.c

@@ -34,7 +34,6 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/wqueue.h>
 
-#include <nuttx/net/arp.h>
 #include <nuttx/net/dns.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/pkt.h>

drivers/net/skeleton.c

@@ -38,7 +38,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT

drivers/net/tun.c

@@ -61,7 +61,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/mutex.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/ethernet.h>
 #include <nuttx/net/tun.h>

drivers/net/w5500.c

@@ -43,7 +43,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/w5500.h>
 #include <nuttx/signal.h>

drivers/usbdev/cdcecm.c

@@ -44,7 +44,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/semaphore.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/cdc.h>

drivers/usbdev/rndis.c

@@ -38,7 +38,6 @@
 #include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
 #include <nuttx/usb/usb.h>

drivers/virtio/virtio-mmio-net.c

@@ -39,7 +39,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/virtio/virtio-mmio.h>
 

drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c

@@ -33,13 +33,13 @@
 #include <fcntl.h>
 #include <stdio.h>
 
+#include <netinet/arp.h>
 #include <net/ethernet.h>
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/signal.h>
 #include <nuttx/wdog.h>
 #include <nuttx/sdio.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/wireless/ieee80211/ieee80211.h>
 
 #include "bcmf_driver.h"

drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c

@@ -38,7 +38,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/wireless/wireless.h>
 #include <nuttx/wireless/ieee80211/bcmf_board.h>

drivers/wireless/ieee802154/xbee/xbee_netdev.c

@@ -41,7 +41,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/mm/iob.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/ieee802154.h>

include/netinet/arp.h

@@ -36,6 +36,17 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* ARP protocol HARDWARE identifiers.  Provided as the sa_family member of a
+ * struct sockaddr.
+ *
+ * When sa_family is ARPHRD_ETHER, the 6 byte Ethernet address is provided
+ * in the first 6-bytes of the sockaddr sa_data array.
+ */
+
+#define ARPHRD_ETHER        1    /* Ethernet */
+#define ARPHRD_IEEE80211    801  /* IEEE 802.11 */
+#define ARPHRD_IEEE802154   804  /* IEEE 802.15.4 */
+
 /* Three ioctls are available on all PF_INET sockets. Each ioctl takes a
  * pointer to a 'struct arpreq' as its parameter.
  */

include/nuttx/net/arp.h

@@ -1,150 +0,0 @@
-/****************************************************************************
- * include/nuttx/net/arp.h
- * Macros and definitions for the ARP module.
- *
- *   Copyright (C) 2007, 2009-2012, 2015-2016, 2018 Gregory Nutt. All rights
- *     reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Derived from uIP with has a similar BSD-style license:
- *
- *   Author: Adam Dunkels <adam@dunkels.com>
- *   Copyright (c) 2001-2003, Adam Dunkels.
- *   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-#ifndef __INCLUDE_NUTTX_NET_ARP_H
-#define __INCLUDE_NUTTX_NET_ARP_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/compiler.h>
-
-#include <sys/socket.h>
-#include <stdint.h>
-
-#include <netinet/in.h>
-#include <netinet/arp.h>
-#include <net/ethernet.h>
-
-#include <nuttx/net/netconfig.h>
-#include <nuttx/net/ethernet.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* ARP protocol HARDWARE identifiers.  Provided as the sa_family member of a
- * struct sockaddr.
- *
- * When sa_family is ARPHRD_ETHER, the 6 byte Ethernet address is provided
- * in the first 6-bytes of the sockaddr sa_data array.
- */
-
-#define ARPHRD_ETHER        1    /* Ethernet */
-#define ARPHRD_IEEE80211    801  /* IEEE 802.11 */
-#define ARPHRD_IEEE802154   804  /* IEEE 802.15.4 */
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/* One entry in the ARP table (volatile!) */
-
-struct arp_entry_s
-{
-  in_addr_t                at_ipaddr;   /* IP address */
-  struct ether_addr        at_ethaddr;  /* Hardware address */
-  clock_t                  at_time;     /* Time of last usage */
-  FAR struct net_driver_s *at_dev;      /* The device driver structure */
-};
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#ifdef CONFIG_NET_ARP
-
-struct net_driver_s; /* Forward reference */
-
-/****************************************************************************
- * Name: arp_input
- *
- * Description:
- *   This function should be called by the Ethernet device driver when an ARP
- *   packet has been received.   The function will act differently
- *   depending on the ARP packet type: if it is a reply for a request
- *   that we previously sent out, the ARP cache will be filled in with
- *   the values from the ARP reply.  If the incoming ARP packet is an ARP
- *   request for our IP address, an ARP reply packet is created and put
- *   into the d_buf buffer.
- *
- *   On entry, this function expects that an ARP packet with a prepended
- *   Ethernet header is present in the d_buf buffer and that the length of
- *   the packet is set in the d_len field.
- *
- *   When the function returns, the value of the field d_len indicates
- *   whether the device driver should send out the ARP reply packet or not.
- *   If d_len is zero, no packet should be sent; If d_len is non-zero, it
- *   contains the length of the outbound packet that is present in the d_buf
- *   buffer.
- *
- ****************************************************************************/
-
-void arp_input(FAR struct net_driver_s *dev);
-
-#else /* CONFIG_NET_ARP */
-
-/* If ARP is disabled, stub out all ARP interfaces */
-
-#  define arp_input(dev)
-
-#endif /* CONFIG_NET_ARP */
-
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __INCLUDE_NUTTX_NET_ARP_H */

include/nuttx/net/netdev.h

@@ -519,6 +519,42 @@ int sixlowpan_input(FAR struct radio_driver_s *ieee,
                     FAR struct iob_s *framelist, FAR const void *metadata);
 #endif
 
+#ifdef CONFIG_NET_ARP
+
+/****************************************************************************
+ * Name: arp_input
+ *
+ * Description:
+ *   This function should be called by the Ethernet device driver when an ARP
+ *   packet has been received.   The function will act differently
+ *   depending on the ARP packet type: if it is a reply for a request
+ *   that we previously sent out, the ARP cache will be filled in with
+ *   the values from the ARP reply.  If the incoming ARP packet is an ARP
+ *   request for our IP address, an ARP reply packet is created and put
+ *   into the d_buf buffer.
+ *
+ *   On entry, this function expects that an ARP packet with a prepended
+ *   Ethernet header is present in the d_buf buffer and that the length of
+ *   the packet is set in the d_len field.
+ *
+ *   When the function returns, the value of the field d_len indicates
+ *   whether the device driver should send out the ARP reply packet or not.
+ *   If d_len is zero, no packet should be sent; If d_len is non-zero, it
+ *   contains the length of the outbound packet that is present in the d_buf
+ *   buffer.
+ *
+ ****************************************************************************/
+
+void arp_input(FAR struct net_driver_s *dev);
+
+#else /* CONFIG_NET_ARP */
+
+/* If ARP is disabled, stub out all ARP interfaces */
+
+#  define arp_input(dev)
+
+#endif /* CONFIG_NET_ARP */
+
 /****************************************************************************
  * Polling of connections
  *

net/arp/arp.h

@@ -40,9 +40,9 @@
 #include <stdint.h>
 #include <errno.h>
 
+#include <netinet/arp.h>
 #include <netinet/in.h>
 
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/semaphore.h>
 
@@ -154,6 +154,16 @@ struct arp_notify_s
 };
 #endif
 
+/* One entry in the ARP table (volatile!) */
+
+struct arp_entry_s
+{
+  in_addr_t                at_ipaddr;   /* IP address */
+  struct ether_addr        at_ethaddr;  /* Hardware address */
+  clock_t                  at_time;     /* Time of last usage */
+  FAR struct net_driver_s *at_dev;      /* The device driver structure */
+};
+
 /****************************************************************************
  * Public Data
  ****************************************************************************/

net/arp/arp_format.c

@@ -49,7 +49,6 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 
 #include "arp/arp.h"
 

net/arp/arp_input.c

@@ -49,7 +49,6 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 
 #include "arp/arp.h"
 #include "devif/devif.h"

net/arp/arp_ipin.c

@@ -47,7 +47,6 @@
 
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 
 #include "arp/arp.h"
 

net/arp/arp_out.c

@@ -49,7 +49,6 @@
 
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 
 #include "route/route.h"
 #include "arp/arp.h"

net/arp/arp_send.c

@@ -34,7 +34,6 @@
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/ip.h>
-#include <nuttx/net/arp.h>
 
 #include "netdev/netdev.h"
 #include "devif/devif.h"

net/arp/arp_table.c

@@ -58,11 +58,10 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/ip.h>
 
-#include <arp/arp.h>
+#include "netdev/netdev.h"
-#include <netdev/netdev.h>
+#include "arp/arp.h"
 
 #ifdef CONFIG_NET_ARP
 

net/devif/devif_poll.c

@@ -31,7 +31,6 @@
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/net.h>
-#include <nuttx/net/arp.h>
 
 #include "devif/devif.h"
 #include "arp/arp.h"

net/netdev/netdev_ioctl.c

@@ -42,7 +42,6 @@
 
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/radiodev.h>
-#include <nuttx/net/arp.h>
 
 #ifdef CONFIG_NET_6LOWPAN
 #  include <nuttx/net/sixlowpan.h>

net/netlink/netlink_route.c

@@ -35,7 +35,6 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/net/net.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/ip.h>
 #include <nuttx/net/neighbor.h>
 #include <nuttx/net/netlink.h>

net/tcp/tcp_send_buffered.c

@@ -50,7 +50,6 @@
 #include <nuttx/net/net.h>
 #include <nuttx/mm/iob.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/tcp.h>
 #include <nuttx/net/net.h>
 

net/tcp/tcp_send_unbuffered.c

@@ -42,7 +42,6 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/tcp.h>
 
 #include "netdev/netdev.h"

net/tcp/tcp_sendfile.c

@@ -44,7 +44,6 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/tcp.h>
 
 #include "netdev/netdev.h"

net/udp/udp_sendto_buffered.c

@@ -49,7 +49,6 @@
 #include <nuttx/net/net.h>
 #include <nuttx/mm/iob.h>
 #include <nuttx/net/netdev.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/udp.h>
 
 #include "netdev/netdev.h"

wireless/bluetooth/bt_netdev.c

@@ -40,7 +40,6 @@
 #include <nuttx/signal.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/mm/iob.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/bluetooth.h>

wireless/ieee802154/mac802154_netdev.c

@@ -41,7 +41,6 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/mutex.h>
 #include <nuttx/mm/iob.h>
-#include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/ieee802154.h>