aboutsummaryrefslogtreecommitdiff
path: root/nuttx/net
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-17 18:35:37 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-17 18:35:37 +0000
commit298194339295d116ec5c47b06fce377c8424b8e0 (patch)
tree1701d3d2c3f6c456a04442336d5fa406bf553b55 /nuttx/net
parent57623d42ebb04f0a0b9e6eb7c0847a3ece2aa0ff (diff)
downloadpx4-firmware-298194339295d116ec5c47b06fce377c8424b8e0.tar.gz
px4-firmware-298194339295d116ec5c47b06fce377c8424b8e0.tar.bz2
px4-firmware-298194339295d116ec5c47b06fce377c8424b8e0.zip
Resync new repository with old repo r5166
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5154 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
-rw-r--r--nuttx/net/Kconfig2
-rw-r--r--nuttx/net/uip/uip_lock.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/nuttx/net/Kconfig b/nuttx/net/Kconfig
index 267045402..718b28b8f 100644
--- a/nuttx/net/Kconfig
+++ b/nuttx/net/Kconfig
@@ -34,7 +34,7 @@ config NET_NOINTS
bool "Not interrupt driven"
default n
---help---
- NET_NOINT indicates that uIP not called from the interrupt level.
+ NET_NOINT indicates that uIP is not called from the interrupt level.
If NET_NOINTS is defined, critical sections will be managed with semaphores;
Otherwise, it assumed that uIP will be called from interrupt level handling
and critical sections will be managed by enabling and disabling interrupts.
diff --git a/nuttx/net/uip/uip_lock.c b/nuttx/net/uip/uip_lock.c
index 0e770cef7..5abcda269 100644
--- a/nuttx/net/uip/uip_lock.c
+++ b/nuttx/net/uip/uip_lock.c
@@ -39,6 +39,7 @@
#include <nuttx/config.h>
+#include <unistd.h>
#include <semaphore.h>
#include <assert.h>
#include <errno.h>