summaryrefslogtreecommitdiff
path: root/nuttx/net/net_vfcntl.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-15 20:26:34 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-15 20:26:34 +0000
commit6353b7f4d277bc2145ad408e349f2a9a98c8c397 (patch)
treed4ccbfd8eaf3d042c0731d2ab970aea8dddeb768 /nuttx/net/net_vfcntl.c
parent69ed3e725f394bd249cb732945a0fc989b394746 (diff)
downloadpx4-nuttx-6353b7f4d277bc2145ad408e349f2a9a98c8c397.tar.gz
px4-nuttx-6353b7f4d277bc2145ad408e349f2a9a98c8c397.tar.bz2
px4-nuttx-6353b7f4d277bc2145ad408e349f2a9a98c8c397.zip
More SLIP integration
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3384 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net/net_vfcntl.c')
-rw-r--r--nuttx/net/net_vfcntl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/net/net_vfcntl.c b/nuttx/net/net_vfcntl.c
index 3ea710425..e1f84a419 100644
--- a/nuttx/net/net_vfcntl.c
+++ b/nuttx/net/net_vfcntl.c
@@ -62,7 +62,7 @@
int net_vfcntl(int sockfd, int cmd, va_list ap)
{
FAR struct socket *psock = sockfd_socket(sockfd);
- irqstate_t flags;
+ uip_lock_t flags;
int err = 0;
int ret = 0;
@@ -76,7 +76,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
/* Interrupts must be disabled in order to perform operations on socket structures */
- flags = irqsave();
+ flags = uip_lock();
switch (cmd)
{
case F_DUPFD:
@@ -219,7 +219,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
break;
}
- irqrestore(flags);
+ uip_unlock(flags);
errout:
if (err != 0)