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

A few build fixes from last, big ARP relocation change

Browse Source
This commit is contained in:
Gregory Nutt 2014-05-30 12:32:20 -06:00
parent af0892ddea
commit 49fa2ff70f
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/kinetis/kinetis_enet.c
View File

@ -69,7 +69,7 @@
#if defined(KINETIS_NENET) && KINETIS_NENET > 0 #if defined(KINETIS_NENET) && KINETIS_NENET > 0
/**************************************************************************** /****************************************************************************
* Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* CONFIG_ENET_NETHIFS determines the number of physical interfaces /* CONFIG_ENET_NETHIFS determines the number of physical interfaces

3
net/Makefile
View File

@ -65,9 +65,6 @@ ifeq ($(CONFIG_NET_SOCKOPTS),y)
SOCK_CSRCS += setsockopt.c getsockopt.c SOCK_CSRCS += setsockopt.c getsockopt.c
ifneq ($(CONFIG_DISABLE_CLOCK),y) ifneq ($(CONFIG_DISABLE_CLOCK),y)
SOCK_CSRCS += net_timeo.c net_dsec2timeval.c net_timeval2dsec.c SOCK_CSRCS += net_timeo.c net_dsec2timeval.c net_timeval2dsec.c
ifneq ($(CONFIG_NET_SLIP),y)
SOCK_CSRCS += net_arptimer.c
endif
endif endif
endif endif

2
net/net_internal.h
View File

@ -51,7 +51,7 @@
#include <nuttx/net/uip/uip.h> #include <nuttx/net/uip/uip.h>
/**************************************************************************** /****************************************************************************
* Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Definitions of 8-bit socket flags */ /* Definitions of 8-bit socket flags */

3
net/net_sockets.c
View File

@ -47,6 +47,7 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/net/arp.h>
#include <nuttx/net/uip/uip.h> #include <nuttx/net/uip/uip.h>
#include <nuttx/net/net.h> #include <nuttx/net/net.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
@ -55,7 +56,7 @@
#include "net_internal.h" #include "net_internal.h"
/**************************************************************************** /****************************************************************************
* Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************