sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove dup definition in nuttx/net/arp.h and include/nuttx/net/ioctl.h

Browse Source
This commit is contained in:
Xiang Xiao 2018-11-09 13:59:45 -06:00 committed by Gregory Nutt
parent bdf93a8abf
commit 9711f6c668
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/netinet/arp.h
View File

@ -43,6 +43,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <stdint.h> #include <stdint.h>
#include <net/if.h>
#include <nuttx/fs/ioctl.h> #include <nuttx/fs/ioctl.h>
/**************************************************************************** /****************************************************************************

21
include/nuttx/net/arp.h
View File

@ -53,6 +53,7 @@
#include <stdint.h> #include <stdint.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/arp.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <nuttx/net/netconfig.h> #include <nuttx/net/netconfig.h>
@ -86,26 +87,6 @@ struct arp_entry_s
clock_t at_time; /* Time of last usage */ 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 * Public Data
****************************************************************************/ ****************************************************************************/

8
include/nuttx/net/ioctl.h
View File

@ -93,14 +93,6 @@
#define SIOCGIPMSFILTER _SIOC(0x001c) /* Retrieve source filter addresses */ #define SIOCGIPMSFILTER _SIOC(0x001c) /* Retrieve source filter addresses */
#define SIOCSIPMSFILTER _SIOC(0x001d) /* Set source filter content */ #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 /* Routing table. Argument is a reference to struct rtentry as defined in
* include/net/route.h * include/net/route.h
*/ */