arp: Remove the unnecessary inclusion of nuttx/net/arp

and change the remain inclusion to netinet/arp.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2022-12-15 18:57:43 +08:00
committed by Petro Karashchenko
parent 9884159346
commit cfc005a460
14 changed files with 7 additions and 28 deletions

View File

@@ -33,12 +33,10 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#if defined(CONFIG_EXAMPLES_BRIDGE_NET1_DHCPC) || \ #if defined(CONFIG_EXAMPLES_BRIDGE_NET1_DHCPC) || \
defined(CONFIG_EXAMPLES_BRIDGE_NET2_DHCPC) defined(CONFIG_EXAMPLES_BRIDGE_NET2_DHCPC)
# include <arpa/inet.h>
# include "netutils/dhcpc.h" # include "netutils/dhcpc.h"
#endif #endif

View File

@@ -31,7 +31,6 @@
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#include "netutils/discover.h" #include "netutils/discover.h"

View File

@@ -34,9 +34,9 @@
#include <net/if.h> #include <net/if.h>
#include <net/route.h> #include <net/route.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <netinet/arp.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/neighbor.h> #include <nuttx/net/neighbor.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"

View File

@@ -40,13 +40,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#ifdef CONFIG_EXAMPLES_TCPECHO_DHCPC
# include <arpa/inet.h>
#endif
/* Here we include the header file for the application(s) we use in /* Here we include the header file for the application(s) we use in
* our project as defined in the config/<board-name>/defconfig file * our project as defined in the config/<board-name>/defconfig file
*/ */

View File

@@ -38,7 +38,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/ether.h> #include <netinet/ether.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#include "netutils/thttpd.h" #include "netutils/thttpd.h"

View File

@@ -56,7 +56,6 @@
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#ifdef CONFIG_EXAMPLES_WEBSERVER_DHCPC #ifdef CONFIG_EXAMPLES_WEBSERVER_DHCPC

View File

@@ -65,14 +65,9 @@
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#include "netutils/xmlrpc.h" #include "netutils/xmlrpc.h"
#ifdef CONFIG_EXAMPLES_XMLRPC_DHCPC
# include <arpa/inet.h>
#endif
/* Here we include the header file for the application(s) we use in /* Here we include the header file for the application(s) we use in
* our project as defined in the config/<board-name>/defconfig file * our project as defined in the config/<board-name>/defconfig file
*/ */

View File

@@ -33,10 +33,10 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <netinet/arp.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
/**************************************************************************** /****************************************************************************

View File

@@ -33,10 +33,10 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <netinet/arp.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
/**************************************************************************** /****************************************************************************

View File

@@ -30,10 +30,9 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <netinet/arp.h>
#include <netpacket/netlink.h> #include <netpacket/netlink.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#if defined(CONFIG_NET_ARP) && defined(CONFIG_NETLINK_ROUTE) #if defined(CONFIG_NET_ARP) && defined(CONFIG_NETLINK_ROUTE)

View File

@@ -33,8 +33,6 @@
#include <netpacket/netlink.h> #include <netpacket/netlink.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#ifdef CONFIG_NETLINK_ROUTE #ifdef CONFIG_NETLINK_ROUTE

View File

@@ -33,10 +33,10 @@
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <netinet/arp.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <net/if.h> #include <net/if.h>
#include <nuttx/net/arp.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
/**************************************************************************** /****************************************************************************

View File

@@ -53,6 +53,7 @@
#include <net/if.h> #include <net/if.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/arp.h>
#include <netinet/ether.h> #include <netinet/ether.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
@@ -71,10 +72,6 @@
# endif # endif
#endif #endif
#ifdef CONFIG_NETLINK_ROUTE
# include <nuttx/net/arp.h>
#endif
#ifdef CONFIG_NETUTILS_NETLIB #ifdef CONFIG_NETUTILS_NETLIB
# include "netutils/netlib.h" # include "netutils/netlib.h"
#endif #endif

View File

@@ -44,8 +44,8 @@
#include <strings.h> #include <strings.h>
#include <math.h> #include <math.h>
#include <errno.h> #include <errno.h>
#include <netinet/arp.h>
#include <nuttx/net/arp.h>
#include <nuttx/wireless/wireless.h> #include <nuttx/wireless/wireless.h>
#include "wireless/wapi.h" #include "wireless/wapi.h"