mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 08:36:24 +08:00
More SLIP integration
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3384 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
+5
-5
@@ -1,7 +1,7 @@
|
||||
/****************************************************************************
|
||||
* net/net_close.c
|
||||
*
|
||||
* Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
|
||||
* Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -146,11 +146,11 @@ static uint16_t netclose_interrupt(struct uip_driver_s *dev, void *pvconn,
|
||||
static inline void netclose_disconnect(FAR struct socket *psock)
|
||||
{
|
||||
struct tcp_close_s state;
|
||||
irqstate_t flags;
|
||||
uip_lock_t flags;
|
||||
|
||||
/* Interrupts are disabled here to avoid race conditions */
|
||||
|
||||
flags = irqsave();
|
||||
flags = uip_lock();
|
||||
|
||||
/* Is the TCP socket in a connected state? */
|
||||
|
||||
@@ -180,7 +180,7 @@ static inline void netclose_disconnect(FAR struct socket *psock)
|
||||
|
||||
/* Wait for the disconnect event */
|
||||
|
||||
(void)sem_wait(&state.cl_sem);
|
||||
(void)uip_lockedwait(&state.cl_sem);
|
||||
|
||||
/* We are now disconnected */
|
||||
|
||||
@@ -190,7 +190,7 @@ static inline void netclose_disconnect(FAR struct socket *psock)
|
||||
}
|
||||
}
|
||||
|
||||
irqrestore(flags);
|
||||
uip_unlock(flags);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user